diff --git a/demo/complex/after-installation.sh b/demo/complex/after-installation.sh index 1629455..68582e3 100755 --- a/demo/complex/after-installation.sh +++ b/demo/complex/after-installation.sh @@ -12,6 +12,9 @@ $(dirname "$0")/test-resources-1.sh echo -e "${B} * Recomputing Grouper admin group and user object...${N}" $(dirname "$0")/recompute.sh +echo -e "${B} * Waiting 120 seconds for changes to propagate to Grouper...${N}" +sleep 120 + echo -e "${B} * Testing Grouper resource...${N}" $(dirname "$0")/test-resource-grouper.sh diff --git a/demo/complex/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-rest-0.2.jar b/demo/complex/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-rest-0.2.jar index f0a05d4..fbc575b 100644 Binary files a/demo/complex/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-rest-0.2.jar and b/demo/complex/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-rest-0.2.jar differ diff --git a/demo/complex/tests/main.bats b/demo/complex/tests/main.bats index 88c4bf2..ecfb6be 100755 --- a/demo/complex/tests/main.bats +++ b/demo/complex/tests/main.bats @@ -209,11 +209,16 @@ load ../../../library check_of_ldap_membership banderson "ou=groups,dc=internet2,dc=edu" "sysadmingroup" complex_directory_1 } -@test "260 Export groups" { +#@test "255 Wait 120 seconds for changes to be propagated to Grouper" { +# if [ -e $BATS_TMPDIR/not-started ]; then skip 'not started'; fi +# +# sleep 120 +#} + +@test "260 Export ref groups" { if [ -e $BATS_TMPDIR/not-started ]; then skip 'not started'; fi - docker cp tests/resources/grouper/t260.gsh complex_grouper_daemon_1:/tmp/ - docker exec complex_grouper_daemon_1 bash -c "/opt/grouper/grouper.apiBinary/bin/gsh /tmp/t260.gsh" + ./add-ref-groups.sh } @test "265 Wait 120 seconds for changes to be propagated to MQ" { @@ -273,7 +278,7 @@ load ../../../library if [ -e $BATS_TMPDIR/not-started ]; then skip 'not started'; fi assert_ldap_user_has_value wprice Entitlement "midpoint:test" complex_directory_1 - assert_ldap_user_has_value wprice Entitlement "midpoint:alum" complex_directory_1 + assert_ldap_user_has_value wprice Entitlement "ref:affiliation:alum" complex_directory_1 } @test "350 Add kwhite to 'midpoint:test', remove wprice from 'ref:affiliation:alum_includes'" { diff --git a/demo/complex/tests/resources/grouper/t260.gsh b/demo/complex/tests/resources/grouper/t260.gsh deleted file mode 100644 index 6bc4982..0000000 --- a/demo/complex/tests/resources/grouper/t260.gsh +++ /dev/null @@ -1,31 +0,0 @@ -System.out.println("************** t260.gsh starting **************"); - -gs = GrouperSession.startRootSession() - -midpointGroups = GroupFinder.findByName(gs, 'etc:midpointGroups') - -new GroupSave(gs).assignName("midpoint:alum").assignCreateParentStemsIfNotExist(true).save() -GroupFinder.findByName(gs, 'midpoint:alum').addMember(SubjectFinder.findByIdentifier('ref:affiliation:alum', 'group', 'g:gsa'), false) -midpointGroups.addMember(SubjectFinder.findByIdentifier('midpoint:alum', 'group', 'g:gsa'), false) - -new GroupSave(gs).assignName("midpoint:community").assignCreateParentStemsIfNotExist(true).save() -GroupFinder.findByName(gs, 'midpoint:community').addMember(SubjectFinder.findByIdentifier('ref:affiliation:community', 'group', 'g:gsa'), false) -midpointGroups.addMember(SubjectFinder.findByIdentifier('midpoint:community', 'group', 'g:gsa'), false) - -new GroupSave(gs).assignName("midpoint:faculty").assignCreateParentStemsIfNotExist(true).save() -GroupFinder.findByName(gs, 'midpoint:faculty').addMember(SubjectFinder.findByIdentifier('ref:affiliation:faculty', 'group', 'g:gsa'), false) -midpointGroups.addMember(SubjectFinder.findByIdentifier('midpoint:faculty', 'group', 'g:gsa'), false) - -new GroupSave(gs).assignName("midpoint:member").assignCreateParentStemsIfNotExist(true).save() -GroupFinder.findByName(gs, 'midpoint:member').addMember(SubjectFinder.findByIdentifier('ref:affiliation:member', 'group', 'g:gsa'), false) -midpointGroups.addMember(SubjectFinder.findByIdentifier('midpoint:member', 'group', 'g:gsa'), false) - -new GroupSave(gs).assignName("midpoint:staff").assignCreateParentStemsIfNotExist(true).save() -GroupFinder.findByName(gs, 'midpoint:staff').addMember(SubjectFinder.findByIdentifier('ref:affiliation:staff', 'group', 'g:gsa'), false) -midpointGroups.addMember(SubjectFinder.findByIdentifier('midpoint:staff', 'group', 'g:gsa'), false) - -new GroupSave(gs).assignName("midpoint:student").assignCreateParentStemsIfNotExist(true).save() -GroupFinder.findByName(gs, 'midpoint:student').addMember(SubjectFinder.findByIdentifier('ref:affiliation:student', 'group', 'g:gsa'), false) -midpointGroups.addMember(SubjectFinder.findByIdentifier('midpoint:student', 'group', 'g:gsa'), false) - -System.out.println("************** t260.gsh done **************");