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 re...@apache.org on 2017/03/01 11:02:50 UTC
svn commit: r1784910 - in /jackrabbit/oak/branches/1.6: ./
oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
Author: reschke
Date: Wed Mar 1 11:02:49 2017
New Revision: 1784910
URL: http://svn.apache.org/viewvc?rev=1784910&view=rev
Log:
OAK-5612: Test failure: org.apache.jackrabbit.oak.run.osgi.DocumentNodeStoreConfigTest.testRDBDocumentStoreRestart (ported to 1.6)
Change test to use retry loop waiting for success; also extended wait to 5s max (from original 0,5s)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 1 11:02:49 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783731,1783733,1783742,1783855,1784023,1784130,1784162,1784251,1784401
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783731,1783733,1783742,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy?rev=1784910&r1=1784909&r2=1784910&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy (original)
+++ jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy Wed Mar 1 11:02:49 2017
@@ -132,6 +132,10 @@ abstract class AbstractRepositoryFactory
}
static retry(int timeoutSeconds, int intervalBetweenTriesMsec, Closure c) {
+ retry(timeoutSeconds, intervalBetweenTriesMsec, null, c)
+ }
+
+ static retry(int timeoutSeconds, int intervalBetweenTriesMsec, String message, Closure c) {
long timeout = System.currentTimeMillis() + timeoutSeconds * 1000L;
while (System.currentTimeMillis() < timeout) {
try {
@@ -148,7 +152,6 @@ abstract class AbstractRepositoryFactory
}
}
- fail("RetryLoop failed, condition is false after " + timeoutSeconds + " seconds: ");
+ fail("RetryLoop failed, condition is false after " + timeoutSeconds + " seconds" + (message ?: (":" + message)));
}
-
}
Modified: jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy?rev=1784910&r1=1784909&r2=1784910&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy (original)
+++ jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy Wed Mar 1 11:02:49 2017
@@ -129,8 +129,15 @@ class DocumentNodeStoreConfigTest extend
//3. Shut down ds
srds.unregister();
- TimeUnit.MILLISECONDS.sleep(500);
- assertNoService(NodeStore.class)
+
+ // Check for service to be unregistered after at most 5s, retrying every 500ms.
+ // Previously, we waited only 500ms; this was extended due to
+ // occasional test failures on Jenkins (see OAK-5612). If 5s
+ // are not sufficient, we should investigate some more.
+ retry (5, 500, "NodeStore should be unregistered") {
+ ServiceReference<NodeStore> sr = registry.getServiceReference(NodeStore.class.name)
+ return sr == null
+ }
//4. Restart ds, service should still be down
srds = registry.registerService(DataSource.class.name, ds, ['datasource.name': 'oak'] as Hashtable)