You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2022/10/01 15:58:45 UTC
[httpcomponents-core] 09/10: Be more lenient on slower build machines like CI agents
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch github_ci_migration
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit d62fad59f4f580104fb327c46b34fa904ee9e38f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 28 10:40:51 2022 -0400
Be more lenient on slower build machines like CI agents
---
.../org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java | 2 +-
.../apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java | 2 +-
.../hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java | 2 +-
.../org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java | 2 +-
.../org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java | 2 +-
.../src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java | 2 +-
.../test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java | 2 +-
.../java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java | 2 +-
.../hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java | 2 +-
.../java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java | 2 +-
.../org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java | 2 +-
.../java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java | 2 +-
.../test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java | 2 +-
.../org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java | 2 +-
.../org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java | 2 +-
.../apache/hc/core5/http/nio/support/classic/TestSharedInputBuffer.java | 2 +-
.../hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
index 4ce5898a3..220aee72d 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
@@ -85,7 +85,7 @@ public class ClassicAuthenticationTest {
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
index b2c423720..c74677d57 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
@@ -81,7 +81,7 @@ public class ClassicServerAndRequesterTest {
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
index ebd6dfa3c..35ef2c132 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
@Extensions({@ExtendWith({ExternalResourceSupport.class})})
public class ClassicServerBootstrapFilterTest {
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
index 4b48aa6d4..80966a149 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
@@ -68,7 +68,7 @@ import org.junit.rules.ExternalResource;
@Extensions({@ExtendWith({ExternalResourceSupport.class})})
public class ClassicTLSIntegrationTest {
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private HttpServer server;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
index f11385415..4b56116a8 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
@@ -77,7 +77,7 @@ public class AsyncServerBootstrapFilterTest {
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private HttpAsyncServer server;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
index 32afe51b4..138f1a395 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
@@ -79,7 +79,7 @@ import org.slf4j.LoggerFactory;
public class H2AlpnTest {
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
@Parameterized.Parameters(name = "strict h2 ALPN: {0}, h2 allowed: {1}")
public static Iterable<Object[]> parameters() {
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
index b41db879e..173798c51 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
@@ -154,7 +154,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
super(scheme);
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private static final Timeout LONG_TIMEOUT = Timeout.ofSeconds(60);
private H2TestClient client;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
index 79fea6c81..37fc4e608 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
@@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory;
@Extensions({@ExtendWith({ExternalResourceSupport.class})})
public class H2ProtocolNegotiationTest {
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
index c50e911bb..0040076df 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
@@ -90,7 +90,7 @@ public class H2ServerAndMultiplexingRequesterTest {
{ URIScheme.HTTPS }
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final URIScheme scheme;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
index e12711052..81c3657ee 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
@@ -87,7 +87,7 @@ public class H2ServerAndRequesterTest {
{ URIScheme.HTTPS }
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final URIScheme scheme;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java
index 438b6d3f4..690b21acc 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java
@@ -78,7 +78,7 @@ public class H2ServerBootstrapFiltersTest {
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private HttpAsyncServer server;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
index 296778dd8..5178e6b47 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
@@ -90,7 +90,7 @@ public class Http1AuthenticationTest {
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
index 4f4cdc59e..fd6633fc5 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
@@ -165,7 +165,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
super(scheme);
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private static final Timeout LONG_TIMEOUT = Timeout.ofSeconds(60);
private Http1TestClient client;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
index 66f4eff0f..8ceb54d20 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
@@ -96,7 +96,7 @@ public class Http1ServerAndRequesterTest {
{ URIScheme.HTTPS }
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final URIScheme scheme;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
index 95f7bc97f..57f984139 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
@@ -93,7 +93,7 @@ public class JSSEProviderIntegrationTest {
this.protocolVersion = protocolVersion;
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private static final int REQ_NUM = 25;
private Provider securityProvider;
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedInputBuffer.java b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedInputBuffer.java
index 0a712b09e..ac1d101cb 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedInputBuffer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedInputBuffer.java
@@ -45,7 +45,7 @@ import org.mockito.Mockito;
public class TestSharedInputBuffer {
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
@Test
public void testBasis() throws Exception {
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java
index ebb74fc37..35e8d55db 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java
@@ -48,7 +48,7 @@ import org.mockito.Mockito;
public class TestSharedOutputBuffer {
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
static class DataStreamChannelMock implements DataStreamChannel {