[WIP] Adjust tests to use different user IDs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
nextcloud · May 26, 2021 · bf60f5e · bf60f5e
1 parent 2d2274d
commit bf60f5e
Show file tree

Hide file tree

Showing 24 changed files with 721 additions and 705 deletions.
diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
@@ -79,7 +79,7 @@ protected function setUp(): void {
 
 		\OC_Hook::clear();
 
-		$this->user = 'test_user';
+		$this->user = 'test_user' . uniqid('', true);
 		$this->createUser($this->user, 'pass');
 
 		$this->loginAsUser($this->user);

diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
@@ -892,8 +892,8 @@ public function testGetSharesInFolder() {
 		$userManager = \OC::$server->getUserManager();
 		$rootFolder = \OC::$server->getRootFolder();
 
-		$u1 = $userManager->createUser('testFed', md5(time()));
-		$u2 = $userManager->createUser('testFed2', md5(time()));
+		$u1 = $userManager->createUser(uniqid('testFed', true), md5(time()));
+		$u2 = $userManager->createUser(uniqid('testFed2', true), md5(time()));
 
 		$folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
 		$file1 = $folder1->newFile('bar1');
@@ -946,7 +946,7 @@ public function testGetAccessList() {
 		$userManager = \OC::$server->getUserManager();
 		$rootFolder = \OC::$server->getRootFolder();
 
-		$u1 = $userManager->createUser('testFed', md5(time()));
+		$u1 = $userManager->createUser(uniqid('testFed', true), md5(time()));
 
 		$folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
 		$file1 = $folder1->newFile('bar1');

diff --git a/apps/federatedfilesharing/tests/TestCase.php b/apps/federatedfilesharing/tests/TestCase.php
@@ -50,24 +50,24 @@ public static function setUpBeforeClass(): void {
 		// create users
 		$backend = new \Test\Util\User\Dummy();
 		\OC_User::useBackend($backend);
-		$backend->createUser(self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER1);
-		$backend->createUser(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_USER2);
+		$backend->createUser($this->TEST_FILES_SHARING_API_USER1, $this->TEST_FILES_SHARING_API_USER1);
+		$backend->createUser($this->TEST_FILES_SHARING_API_USER2, $this->TEST_FILES_SHARING_API_USER2);
 	}
 
 	protected function setUp(): void {
 		parent::setUp();
 
 		//login as user1
-		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		self::loginHelper($this->TEST_FILES_SHARING_API_USER1);
 	}
 
 	public static function tearDownAfterClass(): void {
 		// cleanup users
-		$user = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER1);
+		$user = \OC::$server->getUserManager()->get($this->TEST_FILES_SHARING_API_USER1);
 		if ($user !== null) {
 			$user->delete();
 		}
-		$user = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER2);
+		$user = \OC::$server->getUserManager()->get($this->TEST_FILES_SHARING_API_USER2);
 		if ($user !== null) {
 			$user->delete();
 		}