Author: mduerig
Date: Tue Oct 7 12:24:18 2014
New Revision: 1629864
URL: http://svn.apache.org/r1629864
Log:
OAK-2165: Sporadic test failure of JackrabbitNodeTest#testRenameEventHandling
on Windows CI
Better logging for timeout case
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java?rev=1629864&r1=1629863&r2=1629864&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JackrabbitNodeTest.java
Tue Oct 7 12:24:18 2014
@@ -123,10 +123,13 @@ public class JackrabbitNodeTest extends
JackrabbitNode node = (JackrabbitNode) n;
node.rename(name + 'X');
superuser.save();
- latch1.await(5, SECONDS);
- boolean foundMove = false;
StringBuilder diags = new StringBuilder();
+ if (!latch1.await(5, SECONDS)) {
+ diags.append("latch1 timed out ");
+ }
+
+ boolean foundMove = false;
synchronized (events) {
for (Event event : events) {
if (diags.length() != 0) {
@@ -138,18 +141,21 @@ public class JackrabbitNodeTest extends
break;
}
}
- }
- if (diags.length() == 0) {
- diags.append("none");
+ if (events.isEmpty()) {
+ diags.append("none");
+ }
}
if (!foundMove) {
// force another event, wait some more
testRootNode.addNode(name + "XYZ");
superuser.save();
- latch2.await(60, SECONDS);
StringBuffer addDiags = new StringBuffer();
+ if (!latch2.await(60, SECONDS)) {
+ addDiags.append("latch2 timed out ");
+ }
+
synchronized (events) {
for (Event event : events) {
if (addDiags.length() != 0) {
