You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/03/09 17:31:54 UTC
[karaf-cave] branch master updated: [KARAF-6630] Upgrade to junit
4.13
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-cave.git
The following commit(s) were added to refs/heads/master by this push:
new 2f7a356 [KARAF-6630] Upgrade to junit 4.13
new a198229 Merge pull request #38 from jbonofre/KARAF-6630
2f7a356 is described below
commit 2f7a3567af2aabbca9ea0f06222bc3d5b1b809aa
Author: jbonofre <jb...@apache.org>
AuthorDate: Mon Mar 9 16:42:54 2020 +0100
[KARAF-6630] Upgrade to junit 4.13
---
deployer/service/pom.xml | 2 +-
.../org/apache/karaf/cave/itest/repository/DeployerTest.java | 9 ++-------
pom.xml | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/deployer/service/pom.xml b/deployer/service/pom.xml
index 12a1199..de00532 100644
--- a/deployer/service/pom.xml
+++ b/deployer/service/pom.xml
@@ -267,7 +267,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/itest/src/test/java/org/apache/karaf/cave/itest/repository/DeployerTest.java b/itest/src/test/java/org/apache/karaf/cave/itest/repository/DeployerTest.java
index 511eb44..254899c 100644
--- a/itest/src/test/java/org/apache/karaf/cave/itest/repository/DeployerTest.java
+++ b/itest/src/test/java/org/apache/karaf/cave/itest/repository/DeployerTest.java
@@ -41,19 +41,14 @@ public class DeployerTest extends KarafTestSupport {
return Stream.of(super.config(), options).flatMap(Stream::of).toArray(Option[]::new);
}
- @Test
+ @Test(timeout = 60000L)
public void test() throws Exception {
System.out.println(executeCommand("feature:repo-add cave " + System.getProperty("cave.version")));
System.out.println(executeCommand("feature:install cave-deployer", new RolePrincipal("admin")));
String featureList = executeCommand("feature:list -i");
- int count = 0;
- while (!featureList.contains("cave-deployer") && count < 100) {
+ while (!featureList.contains("cave-deployer")) {
featureList = executeCommand("feature:list -i");
Thread.sleep(100);
- count++;
- }
- if (count >= 100) {
- throw new RuntimeException("cave-deployer feature is not installed");
}
System.out.println("==== Installed Features ====");
System.out.println(featureList);
diff --git a/pom.xml b/pom.xml
index 8c6f65e..8feba64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>