diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-21 20:29:03 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-21 20:29:03 +0100 |
| commit | 97a17e3ffe7a07fbf06d222646f6c134d57dcc9f (patch) | |
| tree | 746cfdedd36faba479421a32b130fa3a7233ac5c | |
| parent | c3544bd27e3c4078f213ce45264b6245681c3e2f (diff) | |
| parent | 91e03f5845bd08f6acc24e6bb443a92787ff92d4 (diff) | |
| download | nextcloud-server-97a17e3ffe7a07fbf06d222646f6c134d57dcc9f.tar.gz nextcloud-server-97a17e3ffe7a07fbf06d222646f6c134d57dcc9f.zip | |
Merge pull request #12981 from owncloud/MDB2SchemaManager-tearDown-Oracle
Properly call parent::tearDown() in MDB2SchemaManager::tearDown().
| -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(); } |