mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 21:45:37 +02:00
Code Issues Projects Releases Wiki Activity

MDL-16486 Flushing output buffer between each test, and fixed problem with update/delete of course_categories and context_temp

Browse Source
This commit is contained in:
nicolasconnault 2008-09-23 05:11:35 +00:00
parent c0d551f05f
commit 747f4a4ce6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/simpletestlib.php
View File

@ -259,6 +259,10 @@ class MoodleUnitTestCase extends UnitTestCase {
}
$DB->cleanup();
parent::tearDown();
// Output buffering
ob_end_flush();
ob_start();
}
/**
@ -356,7 +360,7 @@ class UnitTestDB {
*/
public function update_record($table, $dataobject, $bulk=false) {
global $DB;
if (empty($this->table_data[$table]) || !in_array($dataobject->id, $this->table_data[$table])) {
if ((empty($this->table_data[$table]) || !in_array($dataobject->id, $this->table_data[$table])) && !($table == 'course_categories' && $dataobject->id == 1)) {
// return UnitTestDB::$DB->update_record($table, $dataobject, $bulk);
$a = new stdClass();
$a->id = $dataobject->id;
@ -375,6 +379,8 @@ class UnitTestDB {
*/
public function delete_records($table, array $conditions=array()) {
global $DB;
$tables_to_ignore = array('context_temp');
$a = new stdClass();
$a->table = $table;
@ -390,7 +396,7 @@ class UnitTestDB {
}
foreach ($ids_to_delete as $id) {
if (empty($this->table_data[$table]) || !in_array($id, $this->table_data[$table])) {
if (!in_array($table, $tables_to_ignore) && (empty($this->table_data[$table]) || !in_array($id, $this->table_data[$table]))) {
$proceed_with_delete = false;
$a->id = $id;
break;