diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php index 28d7ea5dffa..3c546d5e472 100644 --- a/lib/phpunit/classes/util.php +++ b/lib/phpunit/classes/util.php @@ -384,6 +384,9 @@ class phpunit_util extends testing_util { install_cli_database($options, false); + // Disable all logging for performance and sanity reasons. + set_config('enabled_stores', '', 'tool_log'); + // install timezone info $timezones = get_records_csv($CFG->libdir.'/timezone.txt', 'timezone'); update_timezone_records($timezones); diff --git a/lib/tests/event_test.php b/lib/tests/event_test.php index 2574f293311..71355be80f3 100644 --- a/lib/tests/event_test.php +++ b/lib/tests/event_test.php @@ -29,17 +29,6 @@ require_once(__DIR__.'/fixtures/event_fixtures.php'); class core_event_testcase extends advanced_testcase { - protected function setUp() { - global $CFG; - // No need to always modify log table here. - $CFG->loglifetime = '-1'; - } - - protected function tearDown() { - global $CFG; - $CFG->loglifetime = '0'; - } - public function test_event_properties() { global $USER; @@ -469,7 +458,7 @@ class core_event_testcase extends advanced_testcase { } public function test_legacy() { - global $DB; + global $DB, $CFG; $this->resetAfterTest(true); @@ -487,6 +476,12 @@ class core_event_testcase extends advanced_testcase { ), ); + // Enable legacy logging plugin. + $this->assertFileExists("$CFG->dirroot/$CFG->admin/tool/log/store/legacy/version.php"); + set_config('enabled_stores', 'logstore_legacy', 'tool_log'); + set_config('loglegacy', 1, 'logstore_legacy'); + get_log_manager(true); + $DB->delete_records('log', array()); events_update_definition('unittest'); $DB->delete_records_select('events_handlers', "component <> 'unittest'"); @@ -529,6 +524,10 @@ class core_event_testcase extends advanced_testcase { $this->assertEquals(3, $log->course); $this->assertSame('core_unittest', $log->module); $this->assertSame('view', $log->action); + + // Disable all logging again. + set_config('enabled_stores', 'logstore_legacy', 'tool_log'); + get_log_manager(true); } public function test_restore_event() {