From 7015cbf75f3c2007fe7197eb67e6c53df19138a6 Mon Sep 17 00:00:00 2001 From: Shamim Rezaie Date: Fri, 18 Feb 2022 01:51:47 +1100 Subject: [PATCH] MDL-73592 phpunit: Run adhoc tasks after install --- lib/behat/classes/util.php | 6 ++++++ lib/phpunit/classes/util.php | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/lib/behat/classes/util.php b/lib/behat/classes/util.php index 6397f2c3d00..3f4f28f2894 100644 --- a/lib/behat/classes/util.php +++ b/lib/behat/classes/util.php @@ -132,6 +132,12 @@ class behat_util extends testing_util { set_config('curlsecurityblockedhosts', ''); set_config('curlsecurityallowedport', ''); + // Execute all the adhoc tasks. + while ($task = \core\task\manager::get_next_adhoc_task(time())) { + $task->execute(); + \core\task\manager::adhoc_task_complete($task); + } + // Keeps the current version of database and dataroot. self::store_versions_hash(); diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php index da44065f360..6b478152c04 100644 --- a/lib/phpunit/classes/util.php +++ b/lib/phpunit/classes/util.php @@ -477,6 +477,12 @@ class phpunit_util extends testing_util { set_config('curlsecurityblockedhosts', ''); set_config('curlsecurityallowedport', ''); + // Execute all the adhoc tasks. + while ($task = \core\task\manager::get_next_adhoc_task(time())) { + $task->execute(); + \core\task\manager::adhoc_task_complete($task); + } + // We need to keep the installed dataroot filedir files. // So each time we reset the dataroot before running a test, the default files are still installed. self::save_original_data_files();