Merge branch 'w12_MDL-44624_m26_dmltest' of git://github.com/skodak/moodle into MOODLE_26_STABLE

This commit is contained in:
Marina Glancy 2014-03-17 18:12:55 +08:00
commit 234e7b0066

View file

@ -5023,7 +5023,7 @@ class core_dml_testcase extends database_driver_testcase {
// 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.
@ -5044,7 +5044,7 @@ class core_dml_testcase extends database_driver_testcase {
// The elapsed time is counted.
$lastqueriestime = $DB->perf_get_queries_time();
$this->assertGreaterThan($previousqueriestime, $lastqueriestime);
$this->assertGreaterThanOrEqual($previousqueriestime, $lastqueriestime);
$previousqueriestime = $lastqueriestime;
$rec2 = new stdClass();
@ -5061,7 +5061,7 @@ class core_dml_testcase extends database_driver_testcase {
// The elapsed time is counted.
$lastqueriestime = $DB->perf_get_queries_time();
$this->assertGreaterThan($previousqueriestime, $lastqueriestime);
$this->assertGreaterThanOrEqual($previousqueriestime, $lastqueriestime);
$previousqueriestime = $lastqueriestime;
// Sum of them.