commit f015df1efab0c5172d0457f4da3e96d797a40770
author Bertrand Delacretaz <bdelacretaz@apache.org> Fri Mar 11 09:35:33 2016 +0000
committer Bertrand Delacretaz <bdelacretaz@apache.org> Fri Mar 11 09:35:33 2016 +0000
tree 4ef7d85e1639ff4e1f1c8e55316a439f5d2c3622
parent 595775786c95a038f8c01507887963c062295216

Use TimeoutsProvider to avoid problems in slower Jenkins builds

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1734516 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index 2245c86..4b8a4ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,22 @@
       <version>1.0.14</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.testing.tools</artifactId>
+      <version>1.0.12</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>2.4</version>

src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java

diff --git a/src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java b/src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java
index 8188142..fc75e71 100644
--- a/src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java
+++ b/src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java
@@ -28,6 +28,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
+import org.apache.sling.testing.tools.sling.TimeoutsProvider;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -58,7 +59,7 @@
         
         assertEquals(404, client.getHttpGetStatus(baseUrl + TEST_PATH));
         activateLater(TEST_PATH, 1000);
-        client.waitForStatus(testUrl, 200, 2000);
+        client.waitForStatus(testUrl, 200, TimeoutsProvider.getInstance().getTimeout(2000));
         assertEquals(200, client.getHttpGetStatus(baseUrl + TEST_PATH));
     }