Commit aafc06c4 by Suma Shivaprasad

ATLAS-280 The url of jceks cause some test cases always fail under Windows(liutongfeng via sumasai)

parent d9f2bf50
...@@ -148,7 +148,7 @@ public class CredentialProviderUtility { ...@@ -148,7 +148,7 @@ public class CredentialProviderUtility {
+ "overwritten " + "overwritten "
+ "(default is 'yes')\n", providerPath); + "(default is 'yes')\n", providerPath);
} }
String providerURI = JavaKeyStoreProvider.SCHEME_NAME + "://file" + providerPath; String providerURI = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + providerPath;
Configuration conf = new Configuration(false); Configuration conf = new Configuration(false);
conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerURI); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerURI);
return CredentialProviderFactory.getProviders(conf).get(0); return CredentialProviderFactory.getProviders(conf).get(0);
......
...@@ -68,7 +68,7 @@ public class CredentialProviderUtilityIT { ...@@ -68,7 +68,7 @@ public class CredentialProviderUtilityIT {
CredentialProviderUtility.main(new String[]{}); CredentialProviderUtility.main(new String[]{});
String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + testPath.toUri(); String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + testPath.toUri();
Configuration conf = new Configuration(false); Configuration conf = new Configuration(false);
conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl);
...@@ -130,7 +130,7 @@ public class CredentialProviderUtilityIT { ...@@ -130,7 +130,7 @@ public class CredentialProviderUtilityIT {
CredentialProviderUtility.main(new String[]{}); CredentialProviderUtility.main(new String[]{});
String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + testPath.toUri(); String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + testPath.toUri();
Configuration conf = new Configuration(false); Configuration conf = new Configuration(false);
conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl);
...@@ -184,7 +184,7 @@ public class CredentialProviderUtilityIT { ...@@ -184,7 +184,7 @@ public class CredentialProviderUtilityIT {
CredentialProviderUtility.main(new String[]{}); CredentialProviderUtility.main(new String[]{});
String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + testPath.toUri(); String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + testPath.toUri();
Configuration conf = new Configuration(false); Configuration conf = new Configuration(false);
conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl);
...@@ -250,7 +250,7 @@ public class CredentialProviderUtilityIT { ...@@ -250,7 +250,7 @@ public class CredentialProviderUtilityIT {
CredentialProviderUtility.main(new String[]{}); CredentialProviderUtility.main(new String[]{});
String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + testPath.toUri(); String providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + testPath.toUri();
Configuration conf = new Configuration(false); Configuration conf = new Configuration(false);
conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, providerUrl);
......
...@@ -49,7 +49,7 @@ public class NegativeSSLAndKerberosTest extends BaseSSLAndKerberosTest { ...@@ -49,7 +49,7 @@ public class NegativeSSLAndKerberosTest extends BaseSSLAndKerberosTest {
@BeforeClass @BeforeClass
public void setUp() throws Exception { public void setUp() throws Exception {
jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks"); jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks");
providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + jksPath.toUri(); providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + jksPath.toUri();
String persistDir = TestUtils.getTempDirectory(); String persistDir = TestUtils.getTempDirectory();
......
...@@ -59,7 +59,7 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest { ...@@ -59,7 +59,7 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest {
@BeforeClass @BeforeClass
public void setUp() throws Exception { public void setUp() throws Exception {
jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks"); jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks");
providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + jksPath.toUri(); providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + jksPath.toUri();
String persistDir = TestUtils.getTempDirectory(); String persistDir = TestUtils.getTempDirectory();
......
...@@ -66,7 +66,7 @@ public class SSLTest extends BaseSSLAndKerberosTest { ...@@ -66,7 +66,7 @@ public class SSLTest extends BaseSSLAndKerberosTest {
@BeforeClass @BeforeClass
public void setUp() throws Exception { public void setUp() throws Exception {
jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks"); jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks");
providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + jksPath.toUri(); providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + jksPath.toUri();
String persistDir = TestUtils.getTempDirectory(); String persistDir = TestUtils.getTempDirectory();
......
...@@ -91,7 +91,7 @@ public class SecureEmbeddedServerTestBase { ...@@ -91,7 +91,7 @@ public class SecureEmbeddedServerTestBase {
@BeforeMethod @BeforeMethod
public void setup() throws Exception { public void setup() throws Exception {
jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks"); jksPath = new Path(Files.createTempDirectory("tempproviders").toString(), "test.jks");
providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file" + jksPath.toUri(); providerUrl = JavaKeyStoreProvider.SCHEME_NAME + "://file/" + jksPath.toUri();
String baseUrl = "https://localhost:21443/"; String baseUrl = "https://localhost:21443/";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment