Merge pull request #38661 from owncloud/tidy-up-user-cleanup-for-ocis…

…-reva [tests-only] Tidy up user cleanup when running on OCIS or reva
owncloud · Apr 29, 2021 · 8bf97c1 · 8bf97c1
2 parents 6697ad9 + 552dd42
commit 8bf97c1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/tests/TestHelpers/OcisHelper.php b/tests/TestHelpers/OcisHelper.php
@@ -78,6 +78,7 @@ public static function getStorageDriver() {
 		if ($storageDriver === false) {
 			return "OWNCLOUD";
 		}
+		$storageDriver = \strtoupper($storageDriver);
 		if ($storageDriver !== "OCIS" && $storageDriver !== "EOS" && $storageDriver !== "OWNCLOUD" && $storageDriver !== "S3NG") {
 			throw new \Exception(
 				"Invalid storage driver. " .
@@ -95,7 +96,9 @@ public static function getStorageDriver() {
 	public static function deleteRevaUserData($user = "") {
 		$deleteCmd = self::getDeleteUserDataCommand();
 		if ($deleteCmd === false) {
-			self::recurseRmdir(self::getOcisRevaDataRoot() . $user);
+			if (self::getStorageDriver() === "OWNCLOUD") {
+				self::recurseRmdir(self::getOcisRevaDataRoot() . $user);
+			}
 			return;
 		}
 		if (self::getStorageDriver() === "EOS") {