diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-12-04 18:04:15 +0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-12-04 18:04:15 +0300 |
| commit | a0488453ac91ba42dd6264a311b5fd620690a83c (patch) | |
| tree | dc36ad9105479a4c8219b09c4efe6e868a065aa3 /tests | |
| parent | e9f0b3002367e34f240405051d842102e01e73c3 (diff) | |
| parent | bf1b62a34accbc3dad75b50db6f186618ef47f5e (diff) | |
Merge pull request #12596 from owncloud/remove-travis-traces
Remove last traces of travis integration
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/appframework/http/DispatcherTest.php | 8 | ||||
| -rw-r--r-- | tests/lib/files/objectstore/swift.php | 6 |
2 files changed, 1 insertions, 13 deletions
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php index 45ebd6fce96..3933e00804b 100644 --- a/tests/lib/appframework/http/DispatcherTest.php +++ b/tests/lib/appframework/http/DispatcherTest.php @@ -232,10 +232,6 @@ class DispatcherTest extends \Test\TestCase { public function testExceptionCallsAfterException() { - // TODO fails on PHP 5.3 - if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $this->markTestSkipped('Fails on PHP 5.3'); - } $out = 'yo'; $httpHeaders = 'Http'; $responseHeaders = array('hell' => 'yeah'); @@ -251,10 +247,6 @@ class DispatcherTest extends \Test\TestCase { public function testExceptionThrowsIfCanNotBeHandledByAfterException() { - // TODO fails on PHP 5.3 and crashed travis (10 minute timeout) - 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'); - } $out = 'yo'; $httpHeaders = 'Http'; $responseHeaders = array('hell' => 'yeah'); 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(); |