QPID-7311: [Java Broker] [SiteSpecificTrustStore] Override test read/connect timeout values for Apache CI.
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
index 4711253..57e7c4b 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
@@ -68,8 +68,10 @@
public void setUp() throws Exception
{
super.setUp();
- setTestSystemProperty(SiteSpecificTrustStore.TRUST_STORE_SITE_SPECIFIC_CONNECT_TIMEOUT, "100");
- setTestSystemProperty(SiteSpecificTrustStore.TRUST_STORE_SITE_SPECIFIC_READ_TIMEOUT, "100");
+ int connectTimeout = Integer.getInteger("SiteSpecificTrustStoreTest.connectTimeout", 100);
+ int readTimeout = Integer.getInteger("SiteSpecificTrustStoreTest.readTimeout", 100);
+ setTestSystemProperty(SiteSpecificTrustStore.TRUST_STORE_SITE_SPECIFIC_CONNECT_TIMEOUT, String.valueOf(connectTimeout));
+ setTestSystemProperty(SiteSpecificTrustStore.TRUST_STORE_SITE_SPECIFIC_READ_TIMEOUT, String.valueOf(readTimeout));
when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
diff --git a/test-profiles/apache-ci.test.overridden.properties b/test-profiles/apache-ci.test.overridden.properties
index b097606..88574d8 100644
--- a/test-profiles/apache-ci.test.overridden.properties
+++ b/test-profiles/apache-ci.test.overridden.properties
@@ -42,3 +42,6 @@
qpid.test_receive_short_timeout=1000
qpid.test_receive_timeout=2000
qpid.test_receive_long_timeout=10000
+
+SiteSpecificTrustStoreTest.connectTimeout=1000
+SiteSpecificTrustStoreTest.readTimeout=1000
