upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

tests: Fix test isolation on object storage

Browse source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2023-02-09 20:44:07 +01:00
parent 5d4efb4d5f
commit 20058eb9de
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files_sharing/tests/ApiTest.php
View file

@ -73,6 +73,7 @@ class ApiTest extends TestCase {
\OC::$server->getConfig()->setAppValue('core', 'shareapi_exclude_groups', 'no');
\OC::$server->getConfig()->setAppValue('core', 'shareapi_expire_after_n_days', '7');
\OC::$server->getConfig()->setAppValue('core', 'shareapi_enforce_links_password', 'no');
$this->folder = self::TEST_FOLDER_NAME;
$this->subfolder = '/subfolder_share_api_test';
@ -80,6 +81,11 @@ class ApiTest extends TestCase {
$this->filename = '/share-api-test.txt';
// Initialize view again as we delete all filecache/mount entries in tearDown
// Otherwise those tests fail on object storage as the filecache is missing the user home
$this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
$this->view2 = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
// save file with content
$this->view->file_put_contents($this->filename, $this->data);
$this->view->mkdir($this->folder);

8
apps/files_sharing/tests/TestCase.php
View file

@ -33,6 +33,7 @@
namespace OCA\Files_Sharing\Tests;
use OC\Files\Filesystem;
use OC\Files\View;
use OCA\Files_Sharing\AppInfo\Application;
use OCA\Files_Sharing\External\MountProvider as ExternalMountProvider;
use OCA\Files_Sharing\MountProvider;
@ -211,7 +212,12 @@ abstract class TestCase extends \Test\TestCase {
\OC::$server->getUserSession()->setUser(null);
\OC\Files\Filesystem::tearDown();
\OC::$server->getUserSession()->login($user, $password);
\OC::$server->getUserFolder($user);
// We need to get the directory listing to trigger the lazy user folder
// to create the files directory. Since the filecache might get cleared
// in the cache, any follow up test case may fail as with object storage
// the filecache represents the file structure
Filesystem::initMountPoints($user);
\OC::$server->getUserFolder($user)->getDirectoryListing();
\OC_Util::setupFS($user);
}