extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 11:21:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some errors in tests due to changing method signatures

Browse Source
This commit is contained in:
nathan 2021-09-30 10:14:38 -06:00
parent db83cc437c
commit fdf6422da7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,15 +296,18 @@ class SharingBase extends LoggedInTest
*/ */
protected function mountVersioned($path) protected function mountVersioned($path)
{ {
if (!class_exists('EGroupware\Stylite\Vfs\Versioning\StreamWrapper')) if(!class_exists('EGroupware\Stylite\Vfs\Versioning\StreamWrapper'))
{ {
$this->markTestSkipped("No versioning available"); $this->markTestSkipped("No versioning available");
} }
if(substr($path, -1) == '/') $path = substr($path, 0, -1); if(substr($path, -1) == '/')
{
$path = substr($path, 0, -1);
}
$backup = Vfs::$is_root; $backup = Vfs::$is_root;
Vfs::$is_root = true; Vfs::$is_root = true;
$url = Versioning\StreamWrapper::PREFIX.$path; $url = Versioning\StreamWrapper::PREFIX . $path;
$this->assertTrue(Vfs::mount($url,$path), "Unable to mount $path as versioned"); $this->assertTrue(Vfs::mount($url, $path, false), "Unable to mount $path as versioned");
Vfs::$is_root = $backup; Vfs::$is_root = $backup;
$this->mounts[] = $path; $this->mounts[] = $path;
@ -362,8 +365,8 @@ class SharingBase extends LoggedInTest
Vfs::chmod($path, 0750); Vfs::chmod($path, 0750);
Vfs::chown($path, $GLOBALS['egw_info']['user']['account_id']); Vfs::chown($path, $GLOBALS['egw_info']['user']['account_id']);
$url = \EGroupware\Stylite\Vfs\Merge\StreamWrapper::SCHEME.'://default'.$path.'?merge=' . realpath(__DIR__ . '/../fixtures/Vfs/filesystem_mount'); $url = \EGroupware\Stylite\Vfs\Merge\StreamWrapper::SCHEME . '://default' . $path . '?merge=' . realpath(__DIR__ . '/../fixtures/Vfs/filesystem_mount');
$this->assertTrue(Vfs::mount($url,$path), "Unable to mount $url to $path"); $this->assertTrue(Vfs::mount($url, $path, false), "Unable to mount $url to $path");
Vfs::$is_root = $backup; Vfs::$is_root = $backup;
$this->mounts[] = $path; $this->mounts[] = $path;