Merge pull request #39910 from owncloud/adjust-ldap-test-code

[tests-only] Make deleteLdapUsersAndGroups backward-compatible for oC10 user_ldap testing
owncloud · Mar 23, 2022 · 8fc353d · 8fc353d
2 parents 80cca97 + 61e1b67
commit 8fc353d
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/tests/acceptance/features/bootstrap/Provisioning.php b/tests/acceptance/features/bootstrap/Provisioning.php
@@ -853,19 +853,25 @@ public function setLdapSetting(string $configId, string $configKey, string $conf
 	 * @throws Exception
 	 */
 	public function deleteLdapUsersAndGroups():void {
+		// pdd
+		$isOcisOrReva = OcisHelper::isTestingOnOcisOrReva();
 		foreach ($this->ldapCreatedUsers as $user) {
-			$this->ldap->delete(
-				"uid=" . ldap_escape($user, "", LDAP_ESCAPE_DN) . ",ou=" . $this->ldapUsersOU . "," . $this->ldapBaseDN,
-			);
+			if ($isOcisOrReva) {
+				$this->ldap->delete(
+					"uid=" . ldap_escape($user, "", LDAP_ESCAPE_DN) . ",ou=" . $this->ldapUsersOU . "," . $this->ldapBaseDN,
+				);
+			}
 			$this->rememberThatUserIsNotExpectedToExist($user);
 		}
 		foreach ($this->ldapCreatedGroups as $group) {
-			$this->ldap->delete(
-				"cn=" . ldap_escape($group, "", LDAP_ESCAPE_DN) . ",ou=" . $this->ldapGroupsOU . "," . $this->ldapBaseDN,
-			);
+			if ($isOcisOrReva) {
+				$this->ldap->delete(
+					"cn=" . ldap_escape($group, "", LDAP_ESCAPE_DN) . ",ou=" . $this->ldapGroupsOU . "," . $this->ldapBaseDN,
+				);
+			}
 			$this->rememberThatGroupIsNotExpectedToExist($group);
 		}
-		if (!$this->skipImportLdif) {
+		if (!$isOcisOrReva || !$this->skipImportLdif) {
 			//delete ou from LDIF import
 			$this->ldap->delete(
 				"ou=" . $this->ldapUsersOU . "," . $this->ldapBaseDN,