svn commit: r1729174 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java

[st...@apache.org]

Author: stefanegli
Date: Mon Feb  8 13:35:58 2016
New Revision: 1729174

URL: http://svn.apache.org/viewvc?rev=1729174&view=rev
Log:
OAK-3986 : fixed margin to be 0.5, was erroneously at 0.2 - ignoring first spike to be even more tolerant on CIs like travis - but doing more loop counts to ensure these relaxed conditions dont cause false positives

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java?rev=1729174&r1=1729173&r2=1729174&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java Mon Feb  8 13:35:58 2016
@@ -127,7 +127,8 @@ public class NonLocalObservationIT exten
         long scaleMeasurement = doRandomized(r, 10000);
         // phase 2 is 10 times measuring how long subsequent 10000 iterations take
         //  (this used to fail due to 'many commit roots')
-        for (int i = 0; i < 10; i++) {
+        boolean ignoreFirstSpike = true;
+        for (int i = 0; i < 15; i++) {
             System.out.println(new Date() + ": test run of 10000 iterations...");
             long testMeasurement = doRandomized(r, 10000);
             Exception e = exception.get();
@@ -137,9 +138,14 @@ public class NonLocalObservationIT exten
             // the testMeasurement should now take less than 50% in relation to
             // the
             // scaleMeasurement
-            long max = (long) (scaleMeasurement * 1.2);
+            long max = (long) (scaleMeasurement * 1.5);
             System.out.println(new Date() + ": test run took " + testMeasurement + ", scaleMeasurement=" + scaleMeasurement
                     + ", plus 50% margin: " + max);
+            if (testMeasurement >= max && ignoreFirstSpike) {
+                System.out.println(new Date() + ": this iteration would have failed, but we're now allowing one spike (ignoreFirstSpike)");
+                ignoreFirstSpike = false;
+                continue;
+            }
             assertTrue("test run (" + testMeasurement + ") took more than 50% longer than initial measurement (" + scaleMeasurement
                     + ") (check VM memory settings)", testMeasurement < max);
         }