[tests-only] Make deleteLdapUsersAndGroups backward-compatible for oC10 user_ldap testing #39910
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phil-davis
commented
Mar 23, 2022
| $this->rememberThatGroupIsNotExpectedToExist($group); | ||
| } | ||
| if (!$this->skipImportLdif) { | ||
| if (!$isOcisOrReva || !$this->skipImportLdif) { |
There was a problem hiding this comment.
Note: we want to always execute this "if" block when we are doing regular oC10 testing (i.e. when not testing oCIS or reva) because in oC10 testing we delete the whole user and group ous and create them again for each test scenario.
individual-it
approved these changes
Mar 23, 2022
|
Kudos, SonarCloud Quality Gate passed!
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The new code in #39893 tries to delete each user and group one-by-one from the LDAP server. It was not done that way previously - we used to just delete the whole user and group "ou".
Put "if" checks around the new code so that we do not do it when testing oC10. That gets the oC10 tests passing.
(We could investigate in more detail about exactly why deleting one-by-one does not work, but for now just put back the original behavior and get CI passing)
Related Issue
How Has This Been Tested?
user_ldap PR owncloud/user_ldap#731 passes.
Types of changes
Checklist: