You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2021/11/17 10:56:27 UTC
[jackrabbit-oak] branch trunk updated: OAK-9623 : EnforceDynamicMembershipTest fails sporadically
This is an automated email from the ASF dual-hosted git repository.
angela pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 309b67d OAK-9623 : EnforceDynamicMembershipTest fails sporadically
309b67d is described below
commit 309b67dbe216d0ad137958b23860aede86513a28
Author: angela <an...@adobe.com>
AuthorDate: Wed Nov 17 11:56:17 2021 +0100
OAK-9623 : EnforceDynamicMembershipTest fails sporadically
---
.../external/impl/EnforceDynamicMembershipTest.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/EnforceDynamicMembershipTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/EnforceDynamicMembershipTest.java
index 94c5973..9dcc2bf 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/EnforceDynamicMembershipTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/EnforceDynamicMembershipTest.java
@@ -24,6 +24,7 @@ import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentity;
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser;
+import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncResult;
import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncContext;
import org.jetbrains.annotations.NotNull;
@@ -33,6 +34,7 @@ import org.junit.Test;
import static org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants.REP_EXTERNAL_PRINCIPAL_NAMES;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
public class EnforceDynamicMembershipTest extends DynamicSyncContextTest {
@@ -91,10 +93,12 @@ public class EnforceDynamicMembershipTest extends DynamicSyncContextTest {
gr.addMember(userManager.createGroup("someOtherMember"));
r.commit();
- syncContext.setForceUserSync(true);
syncConfig.user().setMembershipExpirationTime(-1);
- syncContext.sync(externalUser);
-
+ // create a new context to make sure the membership data has expired
+ DynamicSyncContext dsc = new DynamicSyncContext(syncConfig, idp, userManager, valueFactory);
+ dsc.setForceUserSync(true);
+ assertSame(SyncResult.Status.UPDATE, dsc.sync(externalUser).getStatus());
+
// membership must have been migrated from group to rep:externalPrincipalNames
// groups that have no other members left must be deleted.
Tree t = r.getTree(a.getPath());
@@ -120,10 +124,12 @@ public class EnforceDynamicMembershipTest extends DynamicSyncContextTest {
gr.addMember(a);
r.commit();
- syncContext.setForceUserSync(true);
syncConfig.user().setMembershipExpirationTime(-1);
- syncContext.sync(externalUser);
-
+ // create a new context to make sure the membership data has expired
+ DynamicSyncContext dsc = new DynamicSyncContext(syncConfig, idp, userManager, valueFactory);
+ dsc.setForceUserSync(true);
+ assertSame(SyncResult.Status.UPDATE, dsc.sync(externalUser).getStatus()); r.commit();
+
// membership must have been migrated from group to rep:externalPrincipalNames
// groups that have no other members left must be deleted.
Tree t = r.getTree(a.getPath());