From e5efb6c050f77dc821c42262f4e47413d6b0e559 Mon Sep 17 00:00:00 2001 From: Zhengxi Li Date: Sat, 12 Dec 2020 23:19:56 -0600 Subject: [PATCH] Clear system properties in SecurityUtilsTest --- .../com/vmware/admiral/common/util/SecurityUtilsTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/src/test/java/com/vmware/admiral/common/util/SecurityUtilsTest.java b/common/src/test/java/com/vmware/admiral/common/util/SecurityUtilsTest.java index 1f50b4f17..4ae0d9f45 100644 --- a/common/src/test/java/com/vmware/admiral/common/util/SecurityUtilsTest.java +++ b/common/src/test/java/com/vmware/admiral/common/util/SecurityUtilsTest.java @@ -75,6 +75,9 @@ public void testEnsureTlsDisabledAlgorithms() { assertNotNull(disabledAlgorithms); assertFalse(disabledAlgorithms.contains("TLSv1,")); assertFalse(disabledAlgorithms.contains("TLSv1.1,")); + + System.setProperty("com.vmware.admiral.enable.tlsv1", Boolean.FALSE.toString()); + System.setProperty("com.vmware.admiral.enable.tlsv1.1", Boolean.FALSE.toString()); } @Test @@ -171,6 +174,10 @@ public void testEnsureTrustStoreSettings() throws URISyntaxException { securityProperties = System.getProperty(SECURITY_PROPERTIES); assertNotNull(securityProperties); assertEquals(securityPropertiesValue, securityProperties); + + System.clearProperty(JAVAX_NET_SSL_TRUST_STORE); + System.clearProperty(JAVAX_NET_SSL_TRUST_STORE_PASSWORD); + System.clearProperty(SECURITY_PROPERTIES); } }