Merge branch 'MDL-67217_master' of git://github.com/dmonllao/moodle

UniGe · Nov 25, 2019 · 1eac44f · 1eac44f
2 parents c1bd4a6 + e477e13
commit 1eac44f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/analytics/tests/fixtures/test_analysis.php b/analytics/tests/fixtures/test_analysis.php
@@ -41,7 +41,7 @@ class test_analysis extends \core_analytics\analysis {
      */
     public function process_analysable(\core_analytics\analysable $analysable): array {
         // Half a second.
-        usleep(500000);
+        sleep(1);
         return parent::process_analysable($analysable);
     }
 }
diff --git a/analytics/tests/model_test.php b/analytics/tests/model_test.php
@@ -292,7 +292,7 @@ public function test_model_timelimit() {
 
         $this->resetAfterTest(true);
 
-        set_config('modeltimelimit', 1, 'analytics');
+        set_config('modeltimelimit', 2, 'analytics');
 
         $courses = array();
         for ($i = 0; $i < 5; $i++) {

diff --git a/lib/tests/time_splittings_test.php b/lib/tests/time_splittings_test.php
@@ -303,7 +303,7 @@ public function test_periodic() {
         $mostrecentrange = reset($mostrecentrange);
 
         // We wait for the next range to be added.
-        usleep(1000000);
+        sleep(1);
 
         // We set the analysable again so the time ranges are recalculated.
         $seconds->set_analysable($analysable);
@@ -344,7 +344,7 @@ public function test_periodic() {
         $this->mock_cache_first_analysis_caching($modelid, $analysable->get_id(), end($ranges));
 
         // We wait for the next range to be added.
-        usleep(1000000);
+        sleep(1);
 
         // We set the analysable again so the time ranges are recalculated.
         $upcomingseconds->set_analysable($analysable);