From: David Monllao <davidm@moodle.com>
Date: Mon, 7 Aug 2017 12:41:32 +0000 (+0200)
Subject: Merge branch 'MDL-59642-master' of git://github.com/andrewnicols/moodle
X-Git-Tag: v3.4.0-beta~482
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=bfdc3400615af6225733e7a6cb1fc274e45a369b;hp=d5a99c450ace4f0a3b5bd5106e1cfa48d415f238

Merge branch 'MDL-59642-master' of git://github.com/andrewnicols/moodle
---

diff --git a/lib/tests/statslib_test.php b/lib/tests/statslib_test.php
index 66089a40644..31b99d10a47 100644
--- a/lib/tests/statslib_test.php
+++ b/lib/tests/statslib_test.php
@@ -337,15 +337,29 @@ class core_statslib_testcase extends advanced_testcase {
 
         $this->assertEquals($firstoldtime, stats_get_start_from('daily'));
 
+        $time = time() - 5;
         \core_tests\event\create_executed::create(array('context' => context_system::instance()))->trigger();
+        $DB->set_field('logstore_standard_log', 'timecreated', $time++, [
+                'eventname' => '\\core_tests\\event\\create_executed',
+            ]);
+
         \core_tests\event\read_executed::create(array('context' => context_system::instance()))->trigger();
+        $DB->set_field('logstore_standard_log', 'timecreated', $time++, [
+                'eventname' => '\\core_tests\\event\\read_executed',
+            ]);
+
         \core_tests\event\update_executed::create(array('context' => context_system::instance()))->trigger();
+        $DB->set_field('logstore_standard_log', 'timecreated', $time++, [
+                'eventname' => '\\core_tests\\event\\update_executed',
+            ]);
+
         \core_tests\event\delete_executed::create(array('context' => context_system::instance()))->trigger();
+        $DB->set_field('logstore_standard_log', 'timecreated', $time++, [
+                'eventname' => '\\core_tests\\event\\delete_executed',
+            ]);
 
-        // Fake the origin of events.
         $DB->set_field('logstore_standard_log', 'origin', 'web', array());
-
-        $logs = $DB->get_records('logstore_standard_log');
+        $logs = $DB->get_records('logstore_standard_log', null, 'timecreated ASC');
         $this->assertCount(4, $logs);
 
         $firstnew = reset($logs);