From ea3a71faf7ee57136251a348d80209ea6d1ef802 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 31 Mar 2015 14:11:04 +0800 Subject: [PATCH] MDL-49294 logging: Improve cleanup tests --- admin/tool/log/store/legacy/tests/store_test.php | 12 +++--------- admin/tool/log/store/standard/tests/store_test.php | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/admin/tool/log/store/legacy/tests/store_test.php b/admin/tool/log/store/legacy/tests/store_test.php index c77354496fd..a2aeb982b10 100644 --- a/admin/tool/log/store/legacy/tests/store_test.php +++ b/admin/tool/log/store/legacy/tests/store_test.php @@ -296,15 +296,9 @@ class logstore_legacy_store_testcase extends advanced_testcase { // Remove all logs before "today". set_config('loglifetime', 1); - try { - ob_start(); - $clean = new \logstore_legacy\task\cleanup_task(); - $clean->execute(); - ob_end_clean(); - } catch (Exception $e) { - ob_end_clean(); - throw $e; - } + $this->expectOutputString(" Deleted old legacy log records\n"); + $clean = new \logstore_legacy\task\cleanup_task(); + $clean->execute(); $this->assertEquals(1, $DB->count_records('log')); } diff --git a/admin/tool/log/store/standard/tests/store_test.php b/admin/tool/log/store/standard/tests/store_test.php index 23315565dbb..d28af981c28 100644 --- a/admin/tool/log/store/standard/tests/store_test.php +++ b/admin/tool/log/store/standard/tests/store_test.php @@ -306,15 +306,9 @@ class logstore_standard_store_testcase extends advanced_testcase { // Remove all logs before "today". set_config('loglifetime', 1, 'logstore_standard'); - try { - ob_start(); - $clean = new \logstore_standard\task\cleanup_task(); - $clean->execute(); - ob_end_clean(); - } catch (Exception $e) { - ob_end_clean(); - throw $e; - } + $this->expectOutputString(" Deleted old log records from standard store.\n"); + $clean = new \logstore_standard\task\cleanup_task(); + $clean->execute(); $this->assertEquals(1, $DB->count_records('logstore_standard_log')); }