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

MDL-52385 tasks: Queue ad-hoc tasks in future

Browse Source
This commit is contained in:
Daniel Neis Araujo
2016-04-07 11:49:52 +08:00
committed by Andrew Nicols
parent aeccf4bd94
commit dfb9daeae2
2 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/task/manager.php
+4 -2
View File
@@ -135,8 +135,10 @@ class manager {
global $DB;
$record = self::record_from_adhoc_task($task);
// Schedule it immediately.
$record->nextruntime = time() - 1;
// Schedule it immediately if nextruntime not explicitly set.
if (!$task->get_next_run_time()) {
$record->nextruntime = time() - 1;
}
$result = $DB->insert_record('task_adhoc', $record);
return $result;
lib/tests/adhoc_task_test.php
+51 -9
View File
@@ -37,34 +37,76 @@ require_once(__DIR__ . '/fixtures/task_fixtures.php');
*/
class core_adhoc_task_testcase extends advanced_testcase {
public function test_get_next_adhoc_task() {
/**
* Test basic adhoc task execution.
*/
public function test_get_next_adhoc_task_now() {
$this->resetAfterTest(true);
// Create an adhoc task.
$task = new \core\task\adhoc_test_task();
// Queue it.
$task = \core\task\manager::queue_adhoc_task($task);
\core\task\manager::queue_adhoc_task($task);
$now = time();
// Get it from the scheduler.
$task = \core\task\manager::get_next_adhoc_task($now);
$this->assertNotNull($task);
$this->assertInstanceOf('\\core\\task\\adhoc_test_task', $task);
$task->execute();
\core\task\manager::adhoc_task_complete($task);
}
\core\task\manager::adhoc_task_failed($task);
// Should not get any task.
/**
* Test adhoc task failure retry backoff.
*/
public function test_get_next_adhoc_task_fail_retry() {
$this->resetAfterTest(true);
// Create an adhoc task.
$task = new \core\task\adhoc_test_task();
\core\task\manager::queue_adhoc_task($task);
$now = time();
// Get it from the scheduler, execute it, and mark it as failed.
$task = \core\task\manager::get_next_adhoc_task($now);
$this->assertNull($task);
$task->execute();
\core\task\manager::adhoc_task_failed($task);
// The task will not be returned immediately.
$this->assertNull(\core\task\manager::get_next_adhoc_task($now));
// Should get the adhoc task (retry after delay).
$task = \core\task\manager::get_next_adhoc_task($now + 120);
$this->assertNotNull($task);
$this->assertInstanceOf('\\core\\task\\adhoc_test_task', $task);
$task->execute();
\core\task\manager::adhoc_task_complete($task);
// Should not get any task.
$task = \core\task\manager::get_next_adhoc_task($now);
$this->assertNull($task);
$this->assertNull(\core\task\manager::get_next_adhoc_task($now));
}
/**
* Test future adhoc task execution.
*/
public function test_get_next_adhoc_task_future() {
$this->resetAfterTest(true);
$now = time();
// Create an adhoc task in future.
$task = new \core\task\adhoc_test_task();
$task->set_next_run_time($now + 1000);
\core\task\manager::queue_adhoc_task($task);
// Fetching the next task should not return anything.
$this->assertNull(\core\task\manager::get_next_adhoc_task($now));
// Fetching in the future should return the task.
$task = \core\task\manager::get_next_adhoc_task($now + 1020);
$this->assertInstanceOf('\\core\\task\\adhoc_test_task', $task);
$task->execute();
\core\task\manager::adhoc_task_complete($task);
}
}