Skip to content

Commit bb4a007

Browse files
manusamanusa
authored
test: improve reliability of concurrently run tests
Signed-off-by: Marc Nuri <[email protected]>
1 parent 19927d0 commit bb4a007

File tree

7 files changed

+5
-101
lines changed

7 files changed

+5
-101
lines changed

‎httpclient-jdk/pom.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -86,32 +86,6 @@
8686
<plugin>
8787
<groupId>org.apache.maven.plugins</groupId>
8888
<artifactId>maven-surefire-plugin</artifactId>
89-
<configuration>
90-
<!-- We cleanup system properties an env vars, so that we can test in a predictable env -->
91-
<environmentVariables>
92-
<KUBERNETES_MASTER />
93-
<KUBERNETES_API_VERSION />
94-
<KUBERNETES_TRUST_CERTIFICATES />
95-
<KUBERNETES_CERTS_CA_FILE />
96-
<KUBERNETES_CERTS_CA_DATA />
97-
<KUBERNETES_CERTS_CLIENT_FILE />
98-
<KUBERNETES_CERTS_CLIENT_DATA />
99-
<KUBERNETES_CERTS_CLIENT_KEY_FILE />
100-
<KUBERNETES_CERTS_CLIENT_KEY_DATA />
101-
<KUBERNETES_CERTS_CLIENT_KEY_ALGO />
102-
<KUBERNETES_CERTS_CLIENT_KEY_PASSPHRASE />
103-
<KUBERNETES_AUTH_BASIC_USERNAME />
104-
<KUBERNETES_AUTH_BASIC_PASSWORD />
105-
<KUBERNETES_AUTH_TRYKUBECONFIG />
106-
<KUBERNETES_AUTH_TRYSERVICEACCOUNT />
107-
<KUBERNETES_AUTH_TOKEN />
108-
<KUBERNETES_WATCH_RECONNECTINTERVAL />
109-
<KUBERNETES_WATCH_RECONNECTLIMIT />
110-
<KUBERNETES_REQUEST_TIMEOUT />
111-
<KUBERNETES_NAMESPACE />
112-
<KUBERNETES_TLS_VERSIONS>TLSv1.2,TLSv1.1,TLSv1</KUBERNETES_TLS_VERSIONS>
113-
</environmentVariables>
114-
</configuration>
11589
</plugin>
11690
<plugin>
11791
<groupId>org.codehaus.mojo</groupId>

‎httpclient-jetty/pom.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -100,32 +100,6 @@
100100
<plugin>
101101
<groupId>org.apache.maven.plugins</groupId>
102102
<artifactId>maven-surefire-plugin</artifactId>
103-
<configuration>
104-
<!-- We cleanup system properties an env vars, so that we can test in a predictable env -->
105-
<environmentVariables>
106-
<KUBERNETES_MASTER />
107-
<KUBERNETES_API_VERSION />
108-
<KUBERNETES_TRUST_CERTIFICATES />
109-
<KUBERNETES_CERTS_CA_FILE />
110-
<KUBERNETES_CERTS_CA_DATA />
111-
<KUBERNETES_CERTS_CLIENT_FILE />
112-
<KUBERNETES_CERTS_CLIENT_DATA />
113-
<KUBERNETES_CERTS_CLIENT_KEY_FILE />
114-
<KUBERNETES_CERTS_CLIENT_KEY_DATA />
115-
<KUBERNETES_CERTS_CLIENT_KEY_ALGO />
116-
<KUBERNETES_CERTS_CLIENT_KEY_PASSPHRASE />
117-
<KUBERNETES_AUTH_BASIC_USERNAME />
118-
<KUBERNETES_AUTH_BASIC_PASSWORD />
119-
<KUBERNETES_AUTH_TRYKUBECONFIG />
120-
<KUBERNETES_AUTH_TRYSERVICEACCOUNT />
121-
<KUBERNETES_AUTH_TOKEN />
122-
<KUBERNETES_WATCH_RECONNECTINTERVAL />
123-
<KUBERNETES_WATCH_RECONNECTLIMIT />
124-
<KUBERNETES_REQUEST_TIMEOUT />
125-
<KUBERNETES_NAMESPACE />
126-
<KUBERNETES_TLS_VERSIONS>TLSv1.2,TLSv1.1,TLSv1</KUBERNETES_TLS_VERSIONS>
127-
</environmentVariables>
128-
</configuration>
129103
</plugin>
130104
<plugin>
131105
<groupId>org.codehaus.mojo</groupId>

‎httpclient-okhttp/pom.xml‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -101,30 +101,7 @@
101101
<groupId>org.apache.maven.plugins</groupId>
102102
<artifactId>maven-surefire-plugin</artifactId>
103103
<configuration>
104-
<!-- We cleanup system properties an env vars, so that we can test in a predictable env -->
105-
<environmentVariables>
106-
<KUBERNETES_MASTER />
107-
<KUBERNETES_API_VERSION />
108-
<KUBERNETES_TRUST_CERTIFICATES />
109-
<KUBERNETES_CERTS_CA_FILE />
110-
<KUBERNETES_CERTS_CA_DATA />
111-
<KUBERNETES_CERTS_CLIENT_FILE />
112-
<KUBERNETES_CERTS_CLIENT_DATA />
113-
<KUBERNETES_CERTS_CLIENT_KEY_FILE />
114-
<KUBERNETES_CERTS_CLIENT_KEY_DATA />
115-
<KUBERNETES_CERTS_CLIENT_KEY_ALGO />
116-
<KUBERNETES_CERTS_CLIENT_KEY_PASSPHRASE />
117-
<KUBERNETES_AUTH_BASIC_USERNAME />
118-
<KUBERNETES_AUTH_BASIC_PASSWORD />
119-
<KUBERNETES_AUTH_TRYKUBECONFIG />
120-
<KUBERNETES_AUTH_TRYSERVICEACCOUNT />
121-
<KUBERNETES_AUTH_TOKEN />
122-
<KUBERNETES_WATCH_RECONNECTINTERVAL />
123-
<KUBERNETES_WATCH_RECONNECTLIMIT />
124-
<KUBERNETES_REQUEST_TIMEOUT />
125-
<KUBERNETES_NAMESPACE />
126-
<KUBERNETES_TLS_VERSIONS>TLSv1.2,TLSv1.1,TLSv1</KUBERNETES_TLS_VERSIONS>
127-
</environmentVariables>
104+
<rerunFailingTestsCount>1</rerunFailingTestsCount>
128105
</configuration>
129106
</plugin>
130107
<plugin>

‎httpclient-vertx/pom.xml‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -106,30 +106,7 @@
106106
<groupId>org.apache.maven.plugins</groupId>
107107
<artifactId>maven-surefire-plugin</artifactId>
108108
<configuration>
109-
<!-- We cleanup system properties an env vars, so that we can test in a predictable env -->
110-
<environmentVariables>
111-
<KUBERNETES_MASTER />
112-
<KUBERNETES_API_VERSION />
113-
<KUBERNETES_TRUST_CERTIFICATES />
114-
<KUBERNETES_CERTS_CA_FILE />
115-
<KUBERNETES_CERTS_CA_DATA />
116-
<KUBERNETES_CERTS_CLIENT_FILE />
117-
<KUBERNETES_CERTS_CLIENT_DATA />
118-
<KUBERNETES_CERTS_CLIENT_KEY_FILE />
119-
<KUBERNETES_CERTS_CLIENT_KEY_DATA />
120-
<KUBERNETES_CERTS_CLIENT_KEY_ALGO />
121-
<KUBERNETES_CERTS_CLIENT_KEY_PASSPHRASE />
122-
<KUBERNETES_AUTH_BASIC_USERNAME />
123-
<KUBERNETES_AUTH_BASIC_PASSWORD />
124-
<KUBERNETES_AUTH_TRYKUBECONFIG />
125-
<KUBERNETES_AUTH_TRYSERVICEACCOUNT />
126-
<KUBERNETES_AUTH_TOKEN />
127-
<KUBERNETES_WATCH_RECONNECTINTERVAL />
128-
<KUBERNETES_WATCH_RECONNECTLIMIT />
129-
<KUBERNETES_REQUEST_TIMEOUT />
130-
<KUBERNETES_NAMESPACE />
131-
<KUBERNETES_TLS_VERSIONS>TLSv1.2,TLSv1.1,TLSv1</KUBERNETES_TLS_VERSIONS>
132-
</environmentVariables>
109+
<rerunFailingTestsCount>1</rerunFailingTestsCount>
133110
</configuration>
134111
</plugin>
135112
<plugin>

‎kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractSimultaneousConnectionsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void http1Connections() throws Exception {
110110
asyncResponses.add(client.consumeBytes(request, (value, asyncBody) -> asyncBody.consume()));
111111
handler.await();
112112
}
113-
CompletableFuture.allOf(asyncResponses.toArray(new CompletableFuture[0])).get(60, TimeUnit.SECONDS);
113+
CompletableFuture.allOf(asyncResponses.toArray(new CompletableFuture[0])).get(70, TimeUnit.SECONDS);
114114
assertThat(asyncResponses)
115115
.hasSize(MAX_HTTP_1_CONNECTIONS)
116116
.extracting(CompletableFuture::join)

‎platforms/karaf/itests/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
<artifactId>maven-surefire-plugin</artifactId>
166166
<configuration>
167167
<skip>${karaf.itest.skip}</skip>
168+
<parallel>none</parallel>
168169
<systemPropertyVariables>
169170
<features.xml>${project.build.directory}/features.xml</features.xml>
170171
<features.repo>${project.build.directory}/features-repo</features.repo>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,6 +1103,7 @@
11031103
<ENV_VAR_EXISTS>value</ENV_VAR_EXISTS>
11041104
<ENV_VAR_EXISTS_BOOLEAN>true</ENV_VAR_EXISTS_BOOLEAN>
11051105
</environmentVariables>
1106+
<parallel>suitesAndClasses</parallel>
11061107
</configuration>
11071108
</plugin>
11081109

0 commit comments

Comments
 (0)