Skip to content

Commit

Permalink
Merge branch 'w12_MDL-44624_m26_dmltest' of git://github.com/skodak/m…
Browse files Browse the repository at this point in the history
…oodle into MOODLE_26_STABLE
  • Loading branch information
marinaglancy committed Mar 17, 2014
2 parents 682f0db + a12c7ef commit 234e7b0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/dml/tests/dml_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -5023,7 +5023,7 @@ public function test_queries_counter() {

// The elapsed time is counted.
$lastqueriestime = $DB->perf_get_queries_time();
$this->assertGreaterThan($previousqueriestime, $lastqueriestime);
$this->assertGreaterThanOrEqual($previousqueriestime, $lastqueriestime);
$previousqueriestime = $lastqueriestime;

// Only 1 now, it already fetched the table columns.
Expand All @@ -5044,7 +5044,7 @@ public function test_queries_counter() {

// The elapsed time is counted.
$lastqueriestime = $DB->perf_get_queries_time();
$this->assertGreaterThan($previousqueriestime, $lastqueriestime);
$this->assertGreaterThanOrEqual($previousqueriestime, $lastqueriestime);
$previousqueriestime = $lastqueriestime;

$rec2 = new stdClass();
Expand All @@ -5061,7 +5061,7 @@ public function test_queries_counter() {

// The elapsed time is counted.
$lastqueriestime = $DB->perf_get_queries_time();
$this->assertGreaterThan($previousqueriestime, $lastqueriestime);
$this->assertGreaterThanOrEqual($previousqueriestime, $lastqueriestime);
$previousqueriestime = $lastqueriestime;

// Sum of them.
Expand Down

0 comments on commit 234e7b0

Please sign in to comment.