[java-metadata-aggregator COMMIT] /trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpVal...

[noreply at shibboleth.net]

Author: iay
Date: Wed Apr 10 06:15:22 2013
New Revision: 236

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=236&view=rev
Log:
Add a little fuzz to a comparison to make a test less sensitive to test execution time.  This was causing the test to fail under Jenkins under heavy load on the infrastructure machine.

Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java?rev=236&r1=235&r2=236&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java Wed Apr 10 06:15:22 2013
@@ -95,6 +95,7 @@
         metadataCollection.add(new DomElementItem(readXmlData("samlMetadata/entitiesDescriptor1.xml")));
 
         long twoYears = 1000L * 60 * 60 * 24 * 365 * 2;
+        long twoYearsFromNow = twoYears + System.currentTimeMillis();
         
         PullUpValidUntilStage stage = new PullUpValidUntilStage();
         stage.setId("test");
@@ -109,7 +110,9 @@
         Assert.assertNotNull(validUntilAttr);
 
         long validUntil = AttributeSupport.getDateTimeAttributeAsLong(validUntilAttr);
-        Assert.assertTrue(validUntil < System.currentTimeMillis() + twoYears,
-                "validUntil: " + validUntilAttr.getValue() + ", cur: " + new Date());
+
+        long delta = 1000 * 10; // ten seconds permitted either side to allow for test execution time
+        Assert.assertTrue(validUntil < twoYearsFromNow + delta);
+        Assert.assertTrue(validUntil > twoYearsFromNow - delta);
     }
 }