You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/04/06 13:25:48 UTC
[2/2] syncope git commit: More robust handling of post-migration
checks on slower hw
More robust handling of post-migration checks on slower hw
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/06c2ef9c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/06c2ef9c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/06c2ef9c
Branch: refs/heads/master
Commit: 06c2ef9c942bbc999b0b5c4e53a2fa596311e361
Parents: f0e0199
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Thu Apr 6 15:25:31 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Thu Apr 6 15:25:39 2017 +0200
----------------------------------------------------------------------
.../apache/syncope/core/logic/UserLogic.java | 4 +-
.../syncope/fit/core/MigrationITCase.java | 47 +++++++++++++-------
2 files changed, 34 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/06c2ef9c/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
index f51fdb6..24619f0 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
@@ -194,8 +194,8 @@ public class UserLogic extends AbstractAnyLogic<UserTO, UserPatch> {
securityChecks(effectiveRealms, before.getLeft().getRealm(), null);
}
- Pair<String, List<PropagationStatus>> created = provisioningManager.create(before.getLeft(), storePassword,
- nullPriorityAsync);
+ Pair<String, List<PropagationStatus>> created =
+ provisioningManager.create(before.getLeft(), storePassword, nullPriorityAsync);
return after(binder.returnUserTO(binder.getUserTO(created.getKey())), created.getRight(), before.getRight());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/06c2ef9c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
index fee17fb..ed8d0df 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
@@ -481,11 +481,37 @@ public class MigrationITCase extends AbstractTaskITCase {
// 3. execute pull task
execProvisioningTask(taskService, pullTaskKey, 50, false);
- Thread.sleep(3000L);
-
// 4. verify
- UserTO user = userService.read("rossini12");
+ UserTO user = null;
+
+ int i = 0;
+ boolean membershipFound = false;
+ do {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+
+ try {
+ user = userService.read("rossini12");
+ assertNotNull(user);
+
+ membershipFound = IterableUtils.matchesAny(user.getMemberships(), new Predicate<MembershipTO>() {
+
+ @Override
+ public boolean evaluate(final MembershipTO object) {
+ return "1 root12".equals(object.getGroupName());
+ }
+ });
+ } catch (Exception e) {
+ // ignore
+ }
+
+ i++;
+ } while (!membershipFound && i < 50);
assertNotNull(user);
+ assertTrue(membershipFound);
+
assertEquals("/" + MIGRATION_REALM, user.getRealm());
GroupTO group = groupService.read("12 aRoleForPropagation12");
assertNotNull(group);
@@ -498,22 +524,13 @@ public class MigrationITCase extends AbstractTaskITCase {
// 4b. user resources
assertTrue(user.getResources().contains(RESOURCE_NAME_TESTDB2));
- // 4c. user memberships
- assertTrue(IterableUtils.matchesAny(user.getMemberships(), new Predicate<MembershipTO>() {
-
- @Override
- public boolean evaluate(final MembershipTO object) {
- return "1 root12".equals(object.getGroupName());
- }
- }));
-
- // 4d. user password
+ // 4c. user password
assertNotNull(clientFactory.create("bellini12", ADMIN_PWD).self());
- // 4e. group plain attrs
+ // 4d. group plain attrs
assertEquals("r12", group.getPlainAttrMap().get("title").getValues().get(0));
- // 4f. group resources
+ // 4e. group resources
assertTrue(group.getResources().contains(RESOURCE_NAME_CSV));
}
}