aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/files
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-12-04 10:09:13 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-12-04 10:09:13 +0100
commit2c5e4b3d3fabbe7f36e4922e0f7171bdcbb41208 (patch)
treedc51c4eccb29d20df0454a00b5401b088dacd20e /tests/lib/files
parent5aad902507acd173e8bf8304d13eb27b03abcb08 (diff)
downloadnextcloud-server-2c5e4b3d3fabbe7f36e4922e0f7171bdcbb41208.tar.gz
nextcloud-server-2c5e4b3d3fabbe7f36e4922e0f7171bdcbb41208.zip
Remove last traces of travis integration
Diffstat (limited to 'tests/lib/files')
-rw-r--r--tests/lib/files/objectstore/swift.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/lib/files/objectstore/swift.php b/tests/lib/files/objectstore/swift.php
index f2c4a983cf2..30c60598277 100644
--- a/tests/lib/files/objectstore/swift.php
+++ b/tests/lib/files/objectstore/swift.php
@@ -34,7 +34,7 @@ class Swift extends \Test\Files\Storage\Storage {
parent::setUp();
if (!getenv('RUN_OBJECTSTORE_TESTS')) {
- $this->markTestSkipped('objectstore tests are unreliable on travis');
+ $this->markTestSkipped('objectstore tests are unreliable in some environments');
}
\OC_App::disable('files_sharing');
@@ -87,10 +87,6 @@ class Swift extends \Test\Files\Storage\Storage {
}
public function testStat() {
- // TODO travis
- if (getenv('TRAVIS')) {
- $this->markTestSkipped('Fails on travis - connection times out sometimes');
- }
$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
$ctimeStart = time();