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/02 14:40:11 UTC
[httpcomponents-core] 02/05: 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 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit aebe5ac4eeff932ddcc5f68a56eb3b84502dc6e8
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 +-
.../test/java/org/apache/hc/core5/testing/nio/H2TLSIntegrationTest.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 +-
18 files changed, 18 insertions(+), 18 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 ce1b33221..4d5ef421c 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
@@ -80,7 +80,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 83377b33c..d1e07caa1 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
@@ -78,7 +78,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 83458867d..e86b7121e 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
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
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 98c95af61..a729a16b6 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;
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 ed60fbd57..7eaf1617a 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
@@ -78,7 +78,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 e6ae0d288..86822ab64 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
@@ -82,7 +82,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);
@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 67e4ac799..3eb124b46 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
@@ -152,7 +152,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 5a627cf25..cdb98f84b 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
@@ -75,7 +75,7 @@ import org.slf4j.LoggerFactory;
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 325e6ead1..a38a2f695 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
@@ -91,7 +91,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 f0e789d05..c0dd8e227 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
@@ -88,7 +88,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 e629fb065..7979500bb 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
@@ -79,7 +79,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/H2TLSIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2TLSIntegrationTest.java
index 27f739a5a..9eca38b1b 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2TLSIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2TLSIntegrationTest.java
@@ -80,7 +80,7 @@ import org.junit.rules.ExternalResource;
public class H2TLSIntegrationTest {
- 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 9b779cc4d..2aad64cff 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
@@ -87,7 +87,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 b27ad98aa..05420895f 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
@@ -159,7 +159,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 4fd8002a7..046daab1a 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
@@ -97,7 +97,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 5ddd0c1ce..794d9ebf6 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
@@ -98,7 +98,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 bbd7b6977..b02fc5c1d 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 6858dc288..7c755b87c 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
@@ -49,7 +49,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 {