You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2016/03/11 10:35:33 UTC
svn commit: r1734516 - in /sling/trunk/testing/junit/teleporter: pom.xml
src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java
Author: bdelacretaz
Date: Fri Mar 11 09:35:33 2016
New Revision: 1734516
URL: http://svn.apache.org/viewvc?rev=1734516&view=rev
Log:
Use TimeoutsProvider to avoid problems in slower Jenkins builds
Modified:
sling/trunk/testing/junit/teleporter/pom.xml
sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java
Modified: sling/trunk/testing/junit/teleporter/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/teleporter/pom.xml?rev=1734516&r1=1734515&r2=1734516&view=diff
==============================================================================
--- sling/trunk/testing/junit/teleporter/pom.xml (original)
+++ sling/trunk/testing/junit/teleporter/pom.xml Fri Mar 11 09:35:33 2016
@@ -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>
Modified: sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java?rev=1734516&r1=1734515&r2=1734516&view=diff
==============================================================================
--- sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java (original)
+++ sling/trunk/testing/junit/teleporter/src/test/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClientTest.java Fri Mar 11 09:35:33 2016
@@ -28,6 +28,7 @@ import java.net.MalformedURLException;
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 @@ public class TeleporterHttpClientTest {
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));
}