diff options
| author | Andreas Fischer <bantu@owncloud.com> | 2014-12-20 15:30:02 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@owncloud.com> | 2014-12-20 15:30:35 +0100 |
| commit | 91e03f5845bd08f6acc24e6bb443a92787ff92d4 (patch) | |
| tree | ea00c585345304e2bf9e06ac01a5788a9cabff07 /tests | |
| parent | 79c9fc98a66a2b73fa8b5e9d1e09f2117d84c8cf (diff) | |
| download | nextcloud-server-91e03f5845bd08f6acc24e6bb443a92787ff92d4.tar.gz nextcloud-server-91e03f5845bd08f6acc24e6bb443a92787ff92d4.zip | |
Properly call parent::tearDown() in MDB2SchemaManager::tearDown().
The early return introduced by 04c982a96e19f2254739c24ee8c6b568edcb4190
prevents parent::tearDown() being called on Oracle.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/db/mdb2schemamanager.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/lib/db/mdb2schemamanager.php b/tests/lib/db/mdb2schemamanager.php index 3e6abab70b4..e20f4c421b8 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(); } |