extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 12:30:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better error message & correct lost Vfs::$db

Browse Source
This commit is contained in:
nathangray 2018-04-11 15:36:20 -06:00
parent 63d89a3ba0
commit 5f160114e9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,7 +384,10 @@ class SharingBase extends LoggedInTest
// Make sure the path is there // Make sure the path is there
if(!Vfs::is_readable($path)) if(!Vfs::is_readable($path))
{ {
$this->assertTrue(Vfs::is_dir($path) ? Vfs::mkdir($path,0750,true) : Vfs::touch($path)); $this->assertTrue(
Vfs::is_dir($path) ? Vfs::mkdir($path,0750,true) : Vfs::touch($path),
"Share path $path does not exist"
);
} }
// Create share // Create share
@ -434,6 +437,7 @@ class SharingBase extends LoggedInTest
$_SERVER['REQUEST_URI'] = $link; $_SERVER['REQUEST_URI'] = $link;
preg_match('|^https?://[^/]+(/.*)share.php/'.$share['share_token'].'$|', $path_info=$_SERVER['REQUEST_URI'], $matches); preg_match('|^https?://[^/]+(/.*)share.php/'.$share['share_token'].'$|', $path_info=$_SERVER['REQUEST_URI'], $matches);
$_SERVER['SCRIPT_NAME'] = $matches[1]; $_SERVER['SCRIPT_NAME'] = $matches[1];
$is_dir = Vfs::is_dir($path);
// Log out & clear cache // Log out & clear cache
LoggedInTest::tearDownAfterClass(); LoggedInTest::tearDownAfterClass();
@ -446,7 +450,7 @@ class SharingBase extends LoggedInTest
// 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(Vfs::is_dir($path)) if($is_dir)
{ {
$this->checkDirectoryLink($link, $share); $this->checkDirectoryLink($link, $share);
} }
@ -454,6 +458,8 @@ class SharingBase extends LoggedInTest
// Load share // Load share
$this->setup_info(); $this->setup_info();
// Sometimes Vfs::$db gets lost. Reason unknown.
Vfs::$db = $GLOBALS['egw']->db;
if(static::LOG_LEVEL > 1) if(static::LOG_LEVEL > 1)
{ {