From bd570c3676dcc0d3dede6a4d196de39ef608e351 Mon Sep 17 00:00:00 2001 From: nathangray Date: Fri, 4 May 2018 11:36:38 -0600 Subject: [PATCH] - Fix incorrect skipped method - Move cache clear before logout --- api/tests/Vfs/SharingBase.php | 4 ++-- api/tests/Vfs/SharingTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/tests/Vfs/SharingBase.php b/api/tests/Vfs/SharingBase.php index 50cb347f9e..eddd16312d 100644 --- a/api/tests/Vfs/SharingBase.php +++ b/api/tests/Vfs/SharingBase.php @@ -440,8 +440,6 @@ class SharingBase extends LoggedInTest $_SERVER['SCRIPT_NAME'] = $matches[1]; $is_dir = Vfs::is_dir($path); - // Log out & clear cache - LoggedInTest::tearDownAfterClass(); // Re-init, since they look at user, fstab, etc. // Also, further tests that access the filesystem fail if we don't @@ -449,6 +447,8 @@ class SharingBase extends LoggedInTest Vfs::init_static(); Vfs\StreamWrapper::init_static(); + // Log out & clear cache + LoggedInTest::tearDownAfterClass(); // If it's a directory, check to make sure it gives the filemanager UI if($is_dir) diff --git a/api/tests/Vfs/SharingTest.php b/api/tests/Vfs/SharingTest.php index 97ee1a2d1e..c64353f2b1 100644 --- a/api/tests/Vfs/SharingTest.php +++ b/api/tests/Vfs/SharingTest.php @@ -163,7 +163,7 @@ error_log(array2string($GLOBALS['egw_info']['server'])); { if(!class_exists("\EGroupware\Stylite\Vfs\Merge\StreamWrapper")) { - $this->markTestAsSkipped(); + $this->markTestSkipped(); return; } // Don't add to files list or it deletes the folder from filesystem @@ -191,7 +191,7 @@ error_log(array2string($GLOBALS['egw_info']['server'])); { if(!class_exists("\EGroupware\Stylite\Vfs\Merge\StreamWrapper")) { - $this->markTestAsSkipped(); + $this->markTestSkipped(); return; } // Don't add to files list or it deletes the folder from filesystem