diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-07-30 13:47:03 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-07-30 13:47:03 +0200 |
| commit | 06d118d06c0def5a33aab64c6a2c20f79944b378 (patch) | |
| tree | 82a4dda46eb0c8fcdcaeb5cc5b2f36f1ad3982fe /tests | |
| parent | a9255fbb473c127705fe242d02300c65c5268714 (diff) | |
| parent | 1a7d80acd7592972ca12efff2bfd912abfda269e (diff) | |
| download | nextcloud-server-06d118d06c0def5a33aab64c6a2c20f79944b378.tar.gz nextcloud-server-06d118d06c0def5a33aab64c6a2c20f79944b378.zip | |
Merge pull request #10032 from owncloud/kill-swift-tests
only if the environment variable RUN_OBJECTSTORE_TESTS is set the object...
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/files/objectstore/swift.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/lib/files/objectstore/swift.php b/tests/lib/files/objectstore/swift.php index 7f3b45c0dab..b3fa4fa768c 100644 --- a/tests/lib/files/objectstore/swift.php +++ b/tests/lib/files/objectstore/swift.php @@ -31,6 +31,9 @@ class Swift extends \Test\Files\Storage\Storage { private $objectStorage; public function setUp() { + if (!getenv('RUN_OBJECTSTORE_TESTS')) { + $this->markTestSkipped('objectstore tests are unreliable on travis'); + } \OC_App::disable('files_sharing'); \OC_App::disable('files_versions'); |