moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-45654 cron: fixed dataprovider timestamp issue

Browse source
This commit is contained in:
Sam Hemelryk 2014-05-29 11:21:05 +12:00
parent bc389ac7c8
commit 321a4a90ab
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/tests/cronlib_test.php
View file

@ -41,13 +41,14 @@ class cronlib_testcase extends basic_testcase {
$tmpdir = realpath($CFG->tempdir); $tmpdir = realpath($CFG->tempdir);
$time = time(); $time = time();
$lastweekstime = strtotime('-1 week'); // Relative time stamps. Did you know data providers get executed during phpunit init?
$lastweekstime = -(7 * 24 * 60 * 60);
$beforelastweekstime = $lastweekstime - 60; $beforelastweekstime = $lastweekstime - 60;
$afterlastweekstime = $lastweekstime + 60; $afterlastweekstime = $lastweekstime + 60;
$nodes = array(); $nodes = array();
// Really old directory to remove. // Really old directory to remove.
$nodes[] = $this->generate_test_path('/dir1/dir1_1/dir1_1_1/dir1_1_1_1/', true, 1, false); $nodes[] = $this->generate_test_path('/dir1/dir1_1/dir1_1_1/dir1_1_1_1/', true, $lastweekstime * 52, false);
// New Directory to keep. // New Directory to keep.
$nodes[] = $this->generate_test_path('/dir1/dir1_2/', true, $time, true); $nodes[] = $this->generate_test_path('/dir1/dir1_2/', true, $time, true);
@ -152,14 +153,11 @@ class cronlib_testcase extends basic_testcase {
if ($data->isdir) { if ($data->isdir) {
mkdir($tmpdir.$data->path, $CFG->directorypermissions, true); mkdir($tmpdir.$data->path, $CFG->directorypermissions, true);
} }
touch($tmpdir.$data->path, $data->time);
} }
// We need to iterate through again since adding a file to a directory will // We need to iterate through again since adding a file to a directory will
// update the modified time of the directory. // update the modified time of the directory.
foreach ($nodes as $data) { foreach ($nodes as $data) {
if ($data->isdir) { touch($tmpdir.$data->path, time() + $data->time);
touch($tmpdir.$data->path, $data->time);
}
} }
cron_delete_from_temp(); cron_delete_from_temp();