You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/01/09 10:59:09 UTC
svn commit: r1777952 - in /qpid/java/trunk:
broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
test-profiles/apache-ci.test.overridden.properties
Author: kwall
Date: Mon Jan 9 10:59:09 2017
New Revision: 1777952
URL: http://svn.apache.org/viewvc?rev=1777952&view=rev
Log:
QPID-7311: [Java Broker] [SiteSpecificTrustStore] Override test read/connect timeout values for Apache CI.
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java?rev=1777952&r1=1777951&r2=1777952&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java Mon Jan 9 10:59:09 2017
@@ -68,8 +68,10 @@ public class SiteSpecificTrustStoreTest
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);
Modified: qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties?rev=1777952&r1=1777951&r2=1777952&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties (original)
+++ qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties Mon Jan 9 10:59:09 2017
@@ -42,3 +42,6 @@ MultiNodeTest.testInFlightTransactionsWh
qpid.test_receive_short_timeout=1000
qpid.test_receive_timeout=2000
qpid.test_receive_long_timeout=10000
+
+SiteSpecificTrustStoreTest.connectTimeout=1000
+SiteSpecificTrustStoreTest.readTimeout=1000
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org