Author: chetanm
Date: Fri Mar 18 08:40:36 2016
New Revision: 1735549
URL: http://svn.apache.org/viewvc?rev=1735549&view=rev
Log:
OAK-4132 - JaasConfigSpiTest fails intermittently with missing LoginModule
exception
Ensure that OSGi fwk does get shutdown in all the tests
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
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/AbstractRepositoryFactoryTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy?rev=1735549&r1=1735548&r2=1735549&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
Fri Mar 18 08:40:36 2016
@@ -58,6 +58,15 @@ abstract class AbstractRepositoryFactory
@After
void tearDown() {
+ try {
+ if (repository == null) {
+ PojoServiceRegistry registry = getRegistry()
+ OakOSGiRepositoryFactory.shutdown(registry, 5)
+ }
+ } catch (AssertionError ignore){
+
+ }
+
if (repository instanceof JackrabbitRepository) {
((JackrabbitRepository) repository).shutdown();
}
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy?rev=1735549&r1=1735548&r2=1735549&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
Fri Mar 18 08:40:36 2016
@@ -53,6 +53,11 @@ class ConfigTest {
]
}
+ @After
+ void shutDown(){
+ OakOSGiRepositoryFactory.shutdown(registry, 5)
+ }
+
@Test
void testRuntimeConfig(){
config[REPOSITORY_CONFIG] = createConfigMap()
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy?rev=1735549&r1=1735548&r2=1735549&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
Fri Mar 18 08:40:36 2016
@@ -302,6 +302,7 @@ class DocumentNodeStoreConfigTest extend
@After
public void tearDown() {
+ super.tearDown()
if (mongoConn) {
MongoUtils.dropCollections(mongoConn.DB)
}
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=1735549&r1=1735548&r2=1735549&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
Fri Mar 18 08:40:36 2016
@@ -46,7 +46,11 @@ class SecurityProviderRegistrationTest e
registry = repositoryFactory.initializeServiceRegistry(config)
}
- /**
+ @Override
+ protected PojoServiceRegistry getRegistry() {
+ return registry
+ }
+/**
* Test that, without any additional configuration, a SecurityProvider
* service is registered by default.
*/
