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

MDL-80684 core: Correct location of task tests

Browse Source
This commit is contained in:
Andrew Nicols
2024-02-28 14:21:24 +08:00
parent cd4e7f3fe6
commit cf46667e43
2 changed files with 90 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tests/task/manager_test.php
+86 -29
View File
@@ -16,9 +16,6 @@
namespace core\task;
defined('MOODLE_INTERNAL') || die();
require_once(__DIR__ . '/../fixtures/task_fixtures.php');
/**
* This file contains the unit tests for the task manager.
*
@@ -26,15 +23,19 @@ require_once(__DIR__ . '/../fixtures/task_fixtures.php');
* @category test
* @copyright 2019 Brendan Heywood <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @covers \core\task\manager
*/
class manager_test extends \advanced_testcase {
final class manager_test extends \advanced_testcase {
public static function setUpBeforeClass(): void {
require_once(__DIR__ . '/../fixtures/task_fixtures.php');
}
/**
* Data provider for test_get_candidate_adhoc_tasks.
*
* @return array
*/
public function get_candidate_adhoc_tasks_provider(): array {
public static function get_candidate_adhoc_tasks_provider(): array {
return [
[
'concurrencylimit' => 5,
@@ -45,15 +46,15 @@ class manager_test extends \advanced_testcase {
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null)
new adhoc_test_task(time() - 20, null),
],
'expected' => [
adhoc_test_task::class,
adhoc_test_task::class,
adhoc_test_task::class,
adhoc_test_task::class,
adhoc_test_task::class
]
adhoc_test_task::class,
],
],
[
'concurrencylimit' => 5,
@@ -64,14 +65,14 @@ class manager_test extends \advanced_testcase {
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null)
new adhoc_test_task(time() - 20, null),
],
'expected' => [
adhoc_test_task::class,
adhoc_test_task::class,
adhoc_test_task::class,
adhoc_test_task::class
]
adhoc_test_task::class,
],
],
[
'concurrencylimit' => 1,
@@ -82,9 +83,9 @@ class manager_test extends \advanced_testcase {
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null)
new adhoc_test_task(time() - 20, null),
],
'expected' => []
'expected' => [],
],
[
'concurrencylimit' => 2,
@@ -95,9 +96,9 @@ class manager_test extends \advanced_testcase {
new adhoc_test_task(time() - 20, time()),
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null),
new adhoc_test_task(time() - 20, null)
new adhoc_test_task(time() - 20, null),
],
'expected' => []
'expected' => [],
],
[
'concurrencylimit' => 2,
@@ -108,9 +109,9 @@ class manager_test extends \advanced_testcase {
new adhoc_test_task(time() - 20, time()),
new adhoc_test2_task(time() - 20, time()),
new adhoc_test2_task(time() - 20, time()),
new adhoc_test3_task(time() - 20, null)
new adhoc_test3_task(time() - 20, null),
],
'expected' => [adhoc_test3_task::class]
'expected' => [adhoc_test3_task::class],
],
[
'concurrencylimit' => 2,
@@ -124,8 +125,8 @@ class manager_test extends \advanced_testcase {
],
'expected' => [
adhoc_test_task::class,
adhoc_test_task::class
]
adhoc_test_task::class,
],
],
[
'concurrencylimit' => 2,
@@ -138,8 +139,8 @@ class manager_test extends \advanced_testcase {
new adhoc_test2_task(time() - 20, null),
],
'expected' => [
adhoc_test2_task::class
]
adhoc_test2_task::class,
],
],
[
'concurrencylimit' => 3,
@@ -167,8 +168,8 @@ class manager_test extends \advanced_testcase {
adhoc_test2_task::class,
adhoc_test3_task::class,
adhoc_test4_task::class,
adhoc_test5_task::class
]
adhoc_test5_task::class,
],
],
[
'concurrencylimit' => 3,
@@ -178,7 +179,7 @@ class manager_test extends \advanced_testcase {
'adhoc_test2_task' => 2,
'adhoc_test3_task' => 2,
'adhoc_test4_task' => 2,
'adhoc_test5_task' => 2
'adhoc_test5_task' => 2,
],
'tasks' => [
new adhoc_test_task(time() - 20, time()),
@@ -197,8 +198,8 @@ class manager_test extends \advanced_testcase {
new adhoc_test5_task(time() - 20, time()),
new adhoc_test5_task(time() - 20, null),
],
'expected' => []
]
'expected' => [],
],
];
}
@@ -212,8 +213,6 @@ class manager_test extends \advanced_testcase {
* @param array $pertasklimits Per-task limits
* @param array $tasks Array of tasks to put in DB and retrieve
* @param array $expected Array of expected classnames
* @return void
* @covers \manager::get_candidate_adhoc_tasks
*/
public function test_get_candidate_adhoc_tasks(
int $concurrencylimit,
@@ -231,7 +230,7 @@ class manager_test extends \advanced_testcase {
$candidates = manager::get_candidate_adhoc_tasks(time(), $limit, $concurrencylimit, $pertasklimits);
$this->assertEquals(
array_map(
function(string $classname): string {
function (string $classname): string {
return '\\' . $classname;
},
$expected
@@ -239,4 +238,62 @@ class manager_test extends \advanced_testcase {
array_column($candidates, 'classname')
);
}
/**
* Test that adhoc tasks are set as failed when shutdown is called during execution.
*/
public function test_adhoc_task_running_will_fail_when_shutdown(): void {
$this->resetAfterTest();
$this->preventResetByRollback();
$task1 = new adhoc_test_task();
$task1->set_next_run_time(time() - 20);
manager::queue_adhoc_task($task1);
$next1 = manager::get_next_adhoc_task(time());
\core\task\manager::adhoc_task_starting($next1);
self::assertEmpty(manager::get_failed_adhoc_tasks());
// Trigger shutdown handler.
\core_shutdown_manager::shutdown_handler();
$failedtasks = manager::get_failed_adhoc_tasks();
self::assertCount(1, $failedtasks);
self::assertEquals($next1->get_id(), $failedtasks[0]->get_id());
}
/**
* Test that scheduled tasks are set as failed when shutdown is called during execution.
*/
public function test_scheduled_task_running_will_fail_when_shutdown(): void {
global $DB;
$this->resetAfterTest();
$this->preventResetByRollback();
// Disable all the tasks, so we can insert our own and be sure it's the only one being run.
$DB->set_field('task_scheduled', 'disabled', 1);
$task1 = new scheduled_test_task();
$task1->set_minute('*');
$task1->set_next_run_time(time() - HOURSECS);
$DB->insert_record('task_scheduled', manager::record_from_scheduled_task($task1));
$next1 = \core\task\manager::get_next_scheduled_task(time());
\core\task\manager::scheduled_task_starting($next1);
$running = manager::get_running_tasks();
$this->assertCount(1, $running);
// Trigger shutdown handler.
\core_shutdown_manager::shutdown_handler();
$running = manager::get_running_tasks();
$this->assertCount(0, $running);
$scheduledtask1 = manager::get_scheduled_task(scheduled_test_task::class);
self::assertGreaterThan($next1->get_fail_delay(), $scheduledtask1->get_fail_delay());
}
}
lib/tests/task/running_test.php
+4 -65
View File
@@ -16,10 +16,6 @@
namespace core\task;
defined('MOODLE_INTERNAL') || die();
require_once(__DIR__ . '/../fixtures/task_fixtures.php');
/**
* This file contains unit tests for the 'task running' data.
*
@@ -28,7 +24,10 @@ require_once(__DIR__ . '/../fixtures/task_fixtures.php');
* @copyright 2019 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class running_test extends \advanced_testcase {
final class running_test extends \advanced_testcase {
public static function setUpBeforeClass(): void {
require_once(__DIR__ . '/../fixtures/task_fixtures.php');
}
/**
* Test for ad-hoc tasks.
@@ -156,64 +155,4 @@ class running_test extends \advanced_testcase {
$running = manager::get_running_tasks();
$this->assertCount(0, $running);
}
/**
* Test that adhoc tasks are set as failed when shutdown is called during execution.
* @covers \core\task\manager::fail_running_task
*/
public function test_adhoc_task_running_will_fail_when_shutdown(): void {
$this->resetAfterTest();
$this->preventResetByRollback();
$task1 = new adhoc_test_task();
$task1->set_next_run_time(time() - 20);
manager::queue_adhoc_task($task1);
$next1 = manager::get_next_adhoc_task(time());
\core\task\manager::adhoc_task_starting($next1);
self::assertEmpty(manager::get_failed_adhoc_tasks());
// Trigger shutdown handler.
\core_shutdown_manager::shutdown_handler();
$failedtasks = manager::get_failed_adhoc_tasks();
self::assertCount(1, $failedtasks);
self::assertEquals($next1->get_id(), $failedtasks[0]->get_id());
}
/**
* Test that scheduled tasks are set as failed when shutdown is called during execution.
* @covers \core\task\manager::fail_running_task
*/
public function test_scheduled_task_running_will_fail_when_shutdown(): void {
global $DB;
$this->resetAfterTest();
$this->preventResetByRollback();
// Disable all the tasks, so we can insert our own and be sure it's the only one being run.
$DB->set_field('task_scheduled', 'disabled', 1);
$task1 = new scheduled_test_task();
$task1->set_minute('*');
$task1->set_next_run_time(time() - HOURSECS);
$DB->insert_record('task_scheduled', manager::record_from_scheduled_task($task1));
$next1 = \core\task\manager::get_next_scheduled_task(time());
\core\task\manager::scheduled_task_starting($next1);
$running = manager::get_running_tasks();
$this->assertCount(1, $running);
// Trigger shutdown handler.
\core_shutdown_manager::shutdown_handler();
$running = manager::get_running_tasks();
$this->assertCount(0, $running);
$scheduledtask1 = manager::get_scheduled_task(scheduled_test_task::class);
self::assertGreaterThan($next1->get_fail_delay(), $scheduledtask1->get_fail_delay());
}
}