Repository: incubator-slider
Updated Branches:
  refs/heads/develop 074bdc1d8 -> 8062780eb


SLIDER-902 AMClientCertStoreRetrievalIT#testRetrieveCertificateStores failing 
on Windows (Thomas Liu via gourksaha)


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8062780e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8062780e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8062780e

Branch: refs/heads/develop
Commit: 8062780ebca75b972033a724e45e358fcb7700d5
Parents: 074bdc1
Author: Gour Saha <[email protected]>
Authored: Wed Jun 10 11:01:47 2015 -0700
Committer: Gour Saha <[email protected]>
Committed: Wed Jun 10 11:01:47 2015 -0700

----------------------------------------------------------------------
 .../lifecycle/AMClientCertStoreRetrievalIT.groovy      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8062780e/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMClientCertStoreRetrievalIT.groovy
----------------------------------------------------------------------
diff --git 
a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMClientCertStoreRetrievalIT.groovy
 
b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMClientCertStoreRetrievalIT.groovy
index dae4cc3..f7cd723 100644
--- 
a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMClientCertStoreRetrievalIT.groovy
+++ 
b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMClientCertStoreRetrievalIT.groovy
@@ -46,6 +46,8 @@ import java.security.Principal
 import java.security.cert.Certificate
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
+import com.google.common.io.Files
+import java.io.File
 
 @CompileStatic
 @Slf4j
@@ -78,6 +80,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, 
SliderActions {
 
   @Test
   public void testRetrieveCertificateStores() throws Throwable {
+    assumeNotWindows()
     cleanup(APPLICATION_NAME)
     File launchReportFile = createTempJsonFile();
 
@@ -100,8 +103,8 @@ implements FuntestProperties, Arguments, SliderExitCodes, 
SliderActions {
     assert loggerStats["containers.requested"] == 1
     assert loggerStats["containers.live"] == 1
 
-
-    String filename = "/tmp/test.keystore"
+    File myTempDir = Files.createTempDir();
+    String filename = myTempDir.canonicalPath + File.separator + 
"test.keystore"
     String password = "welcome";
 
     // ensure file doesn't exist
@@ -122,7 +125,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, 
SliderActions {
 
     validateKeystore(keystore)
 
-    filename = "/tmp/test.truststore"
+    filename = myTempDir.canonicalPath + File.separator + "test.truststore"
     // ensure file doesn't exist
     new File(filename).delete();
 
@@ -142,7 +145,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, 
SliderActions {
     validateTruststore(keystore, truststore);
 
     // test retrieving using credential provider to provide password
-    filename = "/tmp/test.keystore"
+    filename = myTempDir.canonicalPath + File.separator + "test.keystore"
     String alias = "alias.for.password"
     String providerString = "jceks://hdfs/user/" +
       UserGroupInformation.getCurrentUser().getShortUserName() + "/test-" +
@@ -180,7 +183,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, 
SliderActions {
 
     validateKeystore(keystore)
 
-    filename = "/tmp/test.truststore"
+    filename = myTempDir.canonicalPath + File.separator + "test.truststore"
     // ensure file doesn't exist
     new File(filename).delete();
 

Reply via email to