Merge branch 'wip-mdl-48192' of https://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 19:33:53 +0000 (08:33 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 19:33:53 +0000 (08:33 +1300)
admin/tool/monitor/tests/eventobservers_test.php

index 73b684f..79356c6 100644 (file)
@@ -404,12 +404,11 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
      * Run adhoc tasks.
      */
     protected function run_adhock_tasks() {
-        ob_start();
         while ($task = \core\task\manager::get_next_adhoc_task(time())) {
             $task->execute();
             \core\task\manager::adhoc_task_complete($task);
         }
-        ob_clean(); // Suppress mtrace debugging info.
+        $this->expectOutputRegex("/^Sending message to the user with id \d+ for the subscription with id \d+\.\.\..Sent./ms");
     }
 
     /**