Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 8f512958a -> 00f614e96


QPID-7867: Remove superfluous trust in new test case 
ExternalAuthenticationTest#testExternalAuthenticationDeniesExpiredClientCert


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/00f614e9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/00f614e9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/00f614e9

Branch: refs/heads/master
Commit: 00f614e96cea8b588046bb28a93fbeb1b170c90d
Parents: 8f51295
Author: Keith Wall <kw...@apache.org>
Authored: Tue Aug 8 10:28:55 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Tue Aug 8 10:29:34 2017 +0100

----------------------------------------------------------------------
 .../server/security/auth/manager/ExternalAuthenticationTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/00f614e9/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
 
b/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
index 1ad564f..7a6a336 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
@@ -161,8 +161,7 @@ public class ExternalAuthenticationTest extends 
QpidBrokerTestCase
     public void testExternalAuthenticationDeniesExpiredClientCert() throws 
Exception
     {
         final String expiredTrustStore = "expiredTrustStore";
-        final List<String>
-                storeNames = 
Arrays.asList(TestBrokerConfiguration.ENTRY_NAME_SSL_TRUSTSTORE, 
expiredTrustStore);
+        final List<String> storeNames = Arrays.asList(expiredTrustStore);
 
         //set the broker's SSL config, inc which SSL stores to use
         setCommonBrokerSSLProperties(true, storeNames);
@@ -173,6 +172,7 @@ public class ExternalAuthenticationTest extends 
QpidBrokerTestCase
         sslTrustStoreAttributes.put(FileTrustStore.PASSWORD, 
BROKER_TRUSTSTORE_PASSWORD);
         
sslTrustStoreAttributes.put(FileTrustStore.TRUST_ANCHOR_VALIDITY_ENFORCED, 
true);
         
getDefaultBrokerConfiguration().addObjectConfiguration(TrustStore.class, 
sslTrustStoreAttributes);
+        
getDefaultBrokerConfiguration().removeObjectConfiguration(TrustStore.class, 
TestBrokerConfiguration.ENTRY_NAME_SSL_TRUSTSTORE);
 
         super.startDefaultBroker();
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to