Increase timeout for CI

.gitlab-ci.yml

@@ -11,8 +11,8 @@ test:
       - .gradle/caches
 
   script:
-    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
+    - ./gradlew --no-daemon animalSnifferMain animalSnifferTest
-    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom test
+    - ./gradlew --no-daemon test
 
   after_script:
     # these file change every time but should not be cached

bramble-android/build.gradle

@@ -55,8 +55,3 @@ project.afterEvaluate {
 		into 'src/main/res/raw'
 	}
 }
-
-tasks.withType(Test) {
-	// Use entropy-gathering device specified on command line, if any
-	systemProperty 'java.security.egd', System.getProperty('java.security.egd')
-}

bramble-api/build.gradle

@@ -31,8 +31,3 @@ task jarTest(type: Jar, dependsOn: testClasses) {
 artifacts {
 	testOutput jarTest
 }
-
-tasks.withType(Test) {
-	// Use entropy-gathering device specified on command line, if any
-	systemProperty 'java.security.egd', System.getProperty('java.security.egd')
-}

bramble-core/build.gradle

@@ -44,8 +44,3 @@ task jarTest(type: Jar, dependsOn: testClasses) {
 artifacts {
 	testOutput jarTest
 }
-
-tasks.withType(Test) {
-	// Use entropy-gathering device specified on command line, if any
-	systemProperty 'java.security.egd', System.getProperty('java.security.egd')
-}

bramble-j2se/build.gradle

@@ -26,7 +26,5 @@ dependencies {
 }
 
 tasks.withType(Test) {
-	// Use entropy-gathering device specified on command line, if any
-	systemProperty 'java.security.egd', System.getProperty('java.security.egd')
 	systemProperty 'java.library.path', 'libs'
 }

briar-android/build.gradle

@@ -186,7 +186,4 @@ project.afterEvaluate {
 	preBuild.dependsOn.add(verifyTranslations)
 }
 
-tasks.withType(Test) {
+
-	// Use entropy-gathering device specified on command line, if any
-	systemProperty 'java.security.egd', System.getProperty('java.security.egd')
-}

briar-api/build.gradle

@@ -11,8 +11,3 @@ dependencies {
 
 	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
 }
-
-tasks.withType(Test) {
-	// Use entropy-gathering device specified on command line, if any
-	systemProperty 'java.security.egd', System.getProperty('java.security.egd')
-}

briar-core/build.gradle

@@ -32,8 +32,3 @@ dependencies {
 
 	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
 }
-
-tasks.withType(Test) {
-	// Use entropy-gathering device specified on command line, if any
-	systemProperty 'java.security.egd', System.getProperty('java.security.egd')
-}

briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java

@@ -123,7 +123,7 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 	private volatile Waiter validationWaiter;
 	private volatile Waiter deliveryWaiter;
 
-	protected final static int TIMEOUT = 15000;
+	protected final static int TIMEOUT = 30000;
 	protected C c0, c1, c2;
 
 	private final File testDir = TestUtils.getTestDirectory();