From b24fbb039fcca157a8ce6ccfb04a43252a2ef2f1 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 28 Apr 2021 21:06:09 +0545 Subject: [PATCH 1/2] Tidy up user cleanup when running on OCIS or reva --- tests/TestHelpers/OcisHelper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/TestHelpers/OcisHelper.php b/tests/TestHelpers/OcisHelper.php index 830225ff9ad1..7a30ac727ab9 100644 --- a/tests/TestHelpers/OcisHelper.php +++ b/tests/TestHelpers/OcisHelper.php @@ -95,7 +95,6 @@ public static function getStorageDriver() { public static function deleteRevaUserData($user = "") { $deleteCmd = self::getDeleteUserDataCommand(); if ($deleteCmd === false) { - self::recurseRmdir(self::getOcisRevaDataRoot() . $user); return; } if (self::getStorageDriver() === "EOS") { From 552dd42d12cef2fb9f9f254cef810e165dae3691 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 28 Apr 2021 22:04:08 +0545 Subject: [PATCH 2/2] Only cleanup with recurseRmdir on owncloud storage --- tests/TestHelpers/OcisHelper.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/TestHelpers/OcisHelper.php b/tests/TestHelpers/OcisHelper.php index 7a30ac727ab9..c0a00c025327 100644 --- 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,6 +96,9 @@ public static function getStorageDriver() { public static function deleteRevaUserData($user = "") { $deleteCmd = self::getDeleteUserDataCommand(); if ($deleteCmd === false) { + if (self::getStorageDriver() === "OWNCLOUD") { + self::recurseRmdir(self::getOcisRevaDataRoot() . $user); + } return; } if (self::getStorageDriver() === "EOS") {