mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12596 from owncloud/remove-travis-traces 

Remove last traces of travis integration
This commit is contained in:
Morris Jobke 2014-12-04 16:04:15 +01:00
parent e9f0b30023 bf1b62a34a
commit a0488453ac
3 changed files with 1 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
apps/files_external/tests/mountconfig.php
View File

@ -296,10 +296,6 @@ class Test_Mount_Config extends \Test\TestCase {
* @dataProvider applicableConfigProvider
*/
public function testReadWriteGlobalConfig($mountType, $applicable, $expectApplicableArray) {
// TODO travis: samba share test doesn't work on travis
if (getenv('TRAVIS')) {
$this->markTestSkipped('samba share test doesn\'t work on travis');
}
$mountType = $mountType;
$applicable = $applicable;
@ -340,10 +336,6 @@ class Test_Mount_Config extends \Test\TestCase {
* Test reading and writing config
*/
public function testReadWritePersonalConfig() {
// TODO travis: samba share test doesn't work on travis
if (getenv('TRAVIS')) {
$this->markTestSkipped('samba share test doesn\'t work on travis');
}
$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
$applicable = self::TEST_USER1;
@ -479,10 +471,6 @@ class Test_Mount_Config extends \Test\TestCase {
* Test password obfuscation
*/
public function testPasswordObfuscation() {
// TODO travis: samba share test doesn't work on travis
if (getenv('TRAVIS')) {
$this->markTestSkipped('samba share test doesn\'t work on travis');
}
$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
$applicable = self::TEST_USER1;
@ -524,10 +512,6 @@ class Test_Mount_Config extends \Test\TestCase {
* Test read legacy passwords
*/
public function testReadLegacyPassword() {
// TODO travis: samba share test doesn't work on travis
if (getenv('TRAVIS')) {
$this->markTestSkipped('samba share test doesn\'t work on travis');
}
$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
$applicable = self::TEST_USER1;
@ -640,10 +624,6 @@ class Test_Mount_Config extends \Test\TestCase {
* @param bool $expectVisible whether to expect the mount point to be visible for $testUser
*/
public function testMount($isPersonal, $mountType, $applicable, $testUser, $expectVisible) {
// TODO travis: samba share test doesn't work on travis
if (getenv('TRAVIS')) {
$this->markTestSkipped('samba share test doesn\'t work on travis');
}
$mountConfig = array(
'host' => 'someost',
@ -684,10 +664,6 @@ class Test_Mount_Config extends \Test\TestCase {
* The config will be merged by getSystemMountPoints().
*/
public function testConfigMerging() {
// TODO travis: samba share test doesn't work on travis
if (getenv('TRAVIS')) {
$this->markTestSkipped('samba share test doesn\'t work on travis');
}
$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
$isPersonal = false;
@ -759,10 +735,6 @@ class Test_Mount_Config extends \Test\TestCase {
* have the same path, the config must NOT be merged.
*/
public function testRereadMountpointWithSamePath() {
// TODO travis: samba share test doesn't work on travis
if (getenv('TRAVIS')) {
$this->markTestSkipped('samba share test doesn\'t work on travis');
}
$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
$isPersonal = false;
@ -895,10 +867,6 @@ class Test_Mount_Config extends \Test\TestCase {
* @param int $expected index of expected visible mount
*/
public function testPriority($mounts, $expected) {
// TODO travis: samba share test doesn't work on travis
if (getenv('TRAVIS')) {
$this->markTestSkipped('samba share test doesn\'t work on travis');
}
$mountConfig = array(
'host' => 'somehost',
@ -933,10 +901,6 @@ class Test_Mount_Config extends \Test\TestCase {
* Test for persistence of priority when changing mount options
*/
public function testPriorityPersistence() {
// TODO travis: samba share test doesn't work on travis
if (getenv('TRAVIS')) {
$this->markTestSkipped('samba share test doesn\'t work on travis');
}
$class = '\OC\Files\Storage\SMB';
$priority = 123;
@ -986,10 +950,6 @@ class Test_Mount_Config extends \Test\TestCase {
* Test for correct personal configuration loading in file sharing scenarios
*/
public function testMultiUserPersonalConfigLoading() {
// TODO travis: multi user config test doesn't work on travis
if (getenv('TRAVIS')) {
$this->markTestSkipped('multi user config test doesn\'t work on travis');
}
$mountConfig = array(
'host' => 'somehost',
'user' => 'someuser',

8
tests/lib/appframework/http/DispatcherTest.php
View File

@ -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');

6
tests/lib/files/objectstore/swift.php
View File

@ -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();