From 12648ad74f63be9874c45fe52efc37c1c59cd85d Mon Sep 17 00:00:00 2001 From: nathangray Date: Fri, 26 Apr 2019 11:08:44 -0600 Subject: [PATCH] Use Travis environment variable to skip the sharing tests that fail instead of always skipping them --- api/tests/Vfs/SharingBase.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/api/tests/Vfs/SharingBase.php b/api/tests/Vfs/SharingBase.php index ec549c2828..daf2c51367 100644 --- a/api/tests/Vfs/SharingBase.php +++ b/api/tests/Vfs/SharingBase.php @@ -61,7 +61,11 @@ class SharingBase extends LoggedInTest public function setUp() { - $this->markTestSkipped("Travis doesn't like these. " . __METHOD__ . ':'.__LINE__); + if(getenv('TRAVIS')) + { + // TODO: Figure out why this doesn't work on Travis + $this->markTestSkipped("Travis doesn't like these. " . __METHOD__ . ':'.__LINE__); + } // Check we have basic access if(!is_readable($GLOBALS['egw_info']['server']['files_dir'])) { @@ -587,7 +591,7 @@ class TestSharing extends Api\Sharing { '', 'text', false, false))) { // Allow for testing - $sessionid = 'CLI_TEST'; + $sessionid = 'CLI_TEST ' . time(); $GLOBALS['egw']->session->sessionid = $sessionid; } return $sessionid;