diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-07 15:23:15 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-19 14:52:07 +0100 |
| commit | bb540722cd4e197bd608d9a87e4b10cf66dec5a9 (patch) | |
| tree | f243bae56944c4b88b2545941a6c6de1e7321f04 /tests/lib/files/objectstore | |
| parent | 284ba5b688d7f0a9d2e1f7b9a68a7e8362be5e67 (diff) | |
| download | nextcloud-server-bb540722cd4e197bd608d9a87e4b10cf66dec5a9.tar.gz nextcloud-server-bb540722cd4e197bd608d9a87e4b10cf66dec5a9.zip | |
Use base class to reset the file mapper
Diffstat (limited to 'tests/lib/files/objectstore')
| -rw-r--r-- | tests/lib/files/objectstore/swift.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/lib/files/objectstore/swift.php b/tests/lib/files/objectstore/swift.php index 37d6cc74de6..f2c4a983cf2 100644 --- a/tests/lib/files/objectstore/swift.php +++ b/tests/lib/files/objectstore/swift.php @@ -30,7 +30,9 @@ class Swift extends \Test\Files\Storage\Storage { private $objectStorage; - public function setUp() { + protected function setUp() { + parent::setUp(); + if (!getenv('RUN_OBJECTSTORE_TESTS')) { $this->markTestSkipped('objectstore tests are unreliable on travis'); } @@ -74,12 +76,14 @@ class Swift extends \Test\Files\Storage\Storage { $this->instance = new ObjectStoreStorage($params); } - public function tearDown() { + protected function tearDown() { if (is_null($this->instance)) { return; } $this->objectStorage->deleteContainer(true); $this->instance->getCache()->clear(); + + parent::tearDown(); } public function testStat() { |