From 91e03f5845bd08f6acc24e6bb443a92787ff92d4 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 20 Dec 2014 15:30:02 +0100 Subject: [PATCH] Properly call parent::tearDown() in MDB2SchemaManager::tearDown(). The early return introduced by 04c982a96e19f2254739c24ee8c6b568edcb4190 prevents parent::tearDown() being called on Oracle. --- tests/lib/db/mdb2schemamanager.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/lib/db/mdb2schemamanager.php b/tests/lib/db/mdb2schemamanager.php index 3e6abab70b..e20f4c421b 100644 --- a/tests/lib/db/mdb2schemamanager.php +++ b/tests/lib/db/mdb2schemamanager.php @@ -17,10 +17,9 @@ class MDB2SchemaManager extends \Test\TestCase { protected function tearDown() { // do not drop the table for Oracle as it will create a bogus transaction // that will break the following test suites requiring transactions - if (\OC::$server->getConfig()->getSystemValue('dbtype', 'sqlite') === 'oci') { - return; + if (\OC::$server->getConfig()->getSystemValue('dbtype', 'sqlite') !== 'oci') { + \OC_DB::dropTable('table'); } - \OC_DB::dropTable('table'); parent::tearDown(); }