Fix AppDirsWithDifferentOwnerTest

Signed-off-by: Côme Chilliet <[email protected]>
nextcloud · Jan 15, 2024 · ed87e4b · ed87e4b
1 parent 17dd695
commit ed87e4b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php
@@ -86,13 +86,6 @@ class CheckSetupControllerTest extends TestCase {
 	/** @var ISetupCheckManager|MockObject */
 	private $setupCheckManager;
 
-	/**
-	 * Holds a list of directories created during tests.
-	 *
-	 * @var array
-	 */
-	private $dirsToRemove = [];
-
 	protected function setUp(): void {
 		parent::setUp();
 
@@ -145,19 +138,6 @@ protected function setUp(): void {
 			])->getMock();
 	}
 
-	/**
-	 * Removes directories created during tests.
-	 *
-	 * @after
-	 * @return void
-	 */
-	public function removeTestDirectories() {
-		foreach ($this->dirsToRemove as $dirToRemove) {
-			rmdir($dirToRemove);
-		}
-		$this->dirsToRemove = [];
-	}
-
 	public function testCheck() {
 		$this->config->expects($this->any())
 			->method('getAppValue')

diff --git a/apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php b/apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php
@@ -33,6 +33,13 @@ class AppDirsWithDifferentOwnerTest extends TestCase {
 	private IL10N $l10n;
 	private AppDirsWithDifferentOwner $check;
 
+	/**
+	 * Holds a list of directories created during tests.
+	 *
+	 * @var array
+	 */
+	private $dirsToRemove = [];
+
 	protected function setUp(): void {
 		parent::setUp();
 
@@ -97,4 +104,17 @@ public function testAppDirectoryOwnersNotWritable() {
 			$this->invokePrivate($this->check, 'getAppDirsWithDifferentOwner', [posix_getuid()])
 		);
 	}
+
+	/**
+	 * Removes directories created during tests.
+	 *
+	 * @after
+	 * @return void
+	 */
+	public function removeTestDirectories() {
+		foreach ($this->dirsToRemove as $dirToRemove) {
+			rmdir($dirToRemove);
+		}
+		$this->dirsToRemove = [];
+	}
 }