holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix incorrect skipped method

Browse Source 
- Move cache clear before logout
This commit is contained in:
nathangray 2018-05-04 11:36:38 -06:00
parent 77a71d1c9c
commit bd570c3676
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/tests/Vfs/SharingBase.php
View File

@ -440,8 +440,6 @@ class SharingBase extends LoggedInTest
$_SERVER['SCRIPT_NAME'] = $matches[1]; $_SERVER['SCRIPT_NAME'] = $matches[1];
$is_dir = Vfs::is_dir($path); $is_dir = Vfs::is_dir($path);
// Log out & clear cache
LoggedInTest::tearDownAfterClass();
// Re-init, since they look at user, fstab, etc. // Re-init, since they look at user, fstab, etc.
// Also, further tests that access the filesystem fail if we don't // Also, further tests that access the filesystem fail if we don't
@ -449,6 +447,8 @@ class SharingBase extends LoggedInTest
Vfs::init_static(); Vfs::init_static();
Vfs\StreamWrapper::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 it's a directory, check to make sure it gives the filemanager UI
if($is_dir) if($is_dir)

4
api/tests/Vfs/SharingTest.php
View File

@ -163,7 +163,7 @@ error_log(array2string($GLOBALS['egw_info']['server']));
{ {
if(!class_exists("\EGroupware\Stylite\Vfs\Merge\StreamWrapper")) if(!class_exists("\EGroupware\Stylite\Vfs\Merge\StreamWrapper"))
{ {
$this->markTestAsSkipped(); $this->markTestSkipped();
return; return;
} }
// Don't add to files list or it deletes the folder from filesystem // 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")) if(!class_exists("\EGroupware\Stylite\Vfs\Merge\StreamWrapper"))
{ {
$this->markTestAsSkipped(); $this->markTestSkipped();
return; return;
} }
// Don't add to files list or it deletes the folder from filesystem // Don't add to files list or it deletes the folder from filesystem