diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-12-04 10:09:13 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-12-04 10:09:13 +0100 |
| commit | 2c5e4b3d3fabbe7f36e4922e0f7171bdcbb41208 (patch) | |
| tree | dc51c4eccb29d20df0454a00b5401b088dacd20e /tests | |
| parent | 5aad902507acd173e8bf8304d13eb27b03abcb08 (diff) | |
| download | nextcloud-server-2c5e4b3d3fabbe7f36e4922e0f7171bdcbb41208.tar.gz nextcloud-server-2c5e4b3d3fabbe7f36e4922e0f7171bdcbb41208.zip | |
Remove last traces of travis integration
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/appframework/http/DispatcherTest.php | 4 | ||||
| -rw-r--r-- | tests/lib/files/objectstore/swift.php | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php index 45ebd6fce96..839d4f02a40 100644 --- a/tests/lib/appframework/http/DispatcherTest.php +++ b/tests/lib/appframework/http/DispatcherTest.php @@ -251,9 +251,9 @@ class DispatcherTest extends \Test\TestCase { public function testExceptionThrowsIfCanNotBeHandledByAfterException() { - // TODO fails on PHP 5.3 and crashed travis (10 minute timeout) + // TODO fails on PHP 5.3 if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $this->markTestSkipped('Fails on PHP 5.3 and causes infinite loop - travis fails after 10 minute timeout'); + $this->markTestSkipped('Fails on PHP 5.3 and causes infinite loop'); } $out = 'yo'; $httpHeaders = 'Http'; 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(); |