Author: mreutegg
Date: Wed Aug 22 13:52:31 2018
New Revision: 1838637
URL: http://svn.apache.org/viewvc?rev=1838637&view=rev
Log:
OAK-7713: Test failure:
SecurityProviderRegistrationTest.testRequiredUserAuthenticationFactoryNotAvailable()
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy?rev=1838637&r1=1838636&r2=1838637&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
Wed Aug 22 13:52:31 2018
@@ -305,13 +305,24 @@ class SecurityProviderRegistrationTest e
// If a service is registered, and if the PID of the service matches
the
// precondition, the SecurityProvider is registered again.
- def registration = registry.registerService(serviceClass.name,
service, dict("service.pid": "test.Required" + serviceClass.simpleName))
+ def registration;
+ awaitServiceEvent({
+ registration = registry.registerService(serviceClass.name,
service, dict("service.pid": "test.Required" + serviceClass.simpleName))
+ },
+
"(objectClass=org.apache.jackrabbit.oak.spi.security.SecurityProvider)",
+ ServiceEvent.REGISTERED
+ )
assert securityProviderServiceReferences != null
// If the service is unregistered, but the precondition is still in
// place, the SecurityProvider unregisters again.
- registration.unregister()
+ awaitServiceEvent({
+ registration.unregister()
+ },
+
"(objectClass=org.apache.jackrabbit.oak.spi.security.SecurityProvider)",
+ ServiceEvent.UNREGISTERING
+ )
assert securityProviderServiceReferences == null
// Removing the precondition allows the SecurityProvider to register.
