diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-30 10:47:45 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-30 10:47:45 +0200 |
| commit | 27ac53be2c275542e703d98545aa94c1431067db (patch) | |
| tree | 83e0c78b2058c772ffb1a442d1be23d7614ad23d /sonar-plugin-api/src/test | |
| parent | 0159a74328358bbfcc1ec6fb38621540f9ec3695 (diff) | |
| download | sonarqube-27ac53be2c275542e703d98545aa94c1431067db.tar.gz sonarqube-27ac53be2c275542e703d98545aa94c1431067db.zip | |
Merge remote-tracking branch 'remotes/origin/branch-4.5'
Conflicts:
sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
Diffstat (limited to 'sonar-plugin-api/src/test')
| -rw-r--r-- | sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java index 023adfde926..6380b849dbd 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java @@ -58,17 +58,13 @@ import static org.mockito.Mockito.when; public class HttpDownloaderTest { @Rule - public Timeout timeout = new Timeout(1000); - - @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Rule -<<<<<<< HEAD public ExpectedException thrown = ExpectedException.none(); -======= + + @Rule public Timeout timeout = new Timeout(2000); ->>>>>>> remotes/origin/branch-4.5 private static SocketConnection socketConnection; private static String baseUrl; |