MDL-32149 make complete PHPUnit test time 2s faster

2012-04-03 22:31:00 +02:00
parent 7514f9c243
commit 03c2d04d0a
1 changed files with 13 additions and 2 deletions
@@ -140,7 +140,7 @@ class phpunit_util {

                    $firstrecord = reset($records);
                    if (property_exists($firstrecord, 'id')) {
-                        if ($DB->count_records($table) == count($records)) {
+                        if ($DB->count_records($table) >= count($records)) {
                            $currentrecords = $DB->get_records($table, array(), 'id ASC');
                            $changed = false;
                            foreach ($records as $id=>$record) {
@@ -152,9 +152,20 @@ class phpunit_util {
                                    $changed = true;
                                    break;
                                }
+                                unset($currentrecords[$id]);
                            }
                            if (!$changed) {
-                                continue;
+                                if ($currentrecords) {
+                                    $remainingfirst = reset($currentrecords);
+                                    $lastrecord = end($records);
+                                    if ($remainingfirst->id > $lastrecord->id) {
+                                        $DB->delete_records_select($table, "id >= ?", array($remainingfirst->id));
+                                        $resetseq[$table] = $table;
+                                        continue;
+                                    }
+                                } else {
+                                    continue;
+                                }
                            }
                        }
                    }