L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-45813-scheduled_task_27' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE

Browse Source
This commit is contained in:
Marina Glancy
2014-06-10 15:42:56 +08:00
parent 5248eb8831 5e10e88673
commit ffa71ca45e
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/task/scheduled_task.php
+1 -1
View File
@@ -340,7 +340,7 @@ abstract class scheduled_task extends task_base {
// otherwise - choose the soonest (see man 5 cron).
if ($this->dayofweek == '*') {
$daysincrement = $daysincrementbymonth;
} else if ($this->dayofmonth == '*') {
} else if ($this->day == '*') {
$daysincrement = $daysincrementbyweek;
} else {
// Take the smaller increment of days by month or week.
lib/tests/scheduled_task_test.php
+22
View File
@@ -90,6 +90,28 @@ class core_scheduled_task_testcase extends advanced_testcase {
$testclass->set_disabled(true);
$nexttime = $testclass->get_next_scheduled_time();
$this->assertEquals($nexttenminutes, $nexttime, 'Next scheduled time is in 10 minutes.');
// Test hourly job executed on Sundays only.
$testclass = new \core\task\scheduled_test_task();
$testclass->set_minute('0');
$testclass->set_day_of_week('7');
$nexttime = $testclass->get_next_scheduled_time();
$this->assertEquals(7, date('N', $nexttime));
$this->assertEquals(0, date('i', $nexttime));
// Test monthly job
$testclass = new \core\task\scheduled_test_task();
$testclass->set_minute('32');
$testclass->set_hour('0');
$testclass->set_day('1');
$nexttime = $testclass->get_next_scheduled_time();
$this->assertEquals(32, date('i', $nexttime));
$this->assertEquals(0, date('G', $nexttime));
$this->assertEquals(1, date('j', $nexttime));
}
public function test_timezones() {