Repository: incubator-ranger Updated Branches: refs/heads/master a63bf0aaa -> 5f29db871
RANGER-234: added Java code to delete existing keystore file to be able to create a new keystore Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/5f29db87 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/5f29db87 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/5f29db87 Branch: refs/heads/master Commit: 5f29db871e6536dc790f9717664b01bd55898974 Parents: a63bf0a Author: sneethiraj <[email protected]> Authored: Wed Feb 25 13:52:40 2015 -0800 Committer: sneethiraj <[email protected]> Committed: Wed Feb 25 13:52:40 2015 -0800 ---------------------------------------------------------------------- .../hadoop/utils/RangerCredentialProviderTest.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/5f29db87/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java ---------------------------------------------------------------------- diff --git a/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java b/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java index 0443eb2..65e5cf6 100644 --- a/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java +++ b/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java @@ -34,7 +34,9 @@ import org.apache.hadoop.security.alias.CredentialProvider; import org.apache.ranger.authorization.hadoop.utils.RangerCredentialProvider; public class RangerCredentialProviderTest { - private final String keystoreFile = new File(System.getProperty("user.home")+"/testkeystore.jceks").toURI().getPath(); + + private final File ksFile = new File(System.getProperty("user.home")+"/testkeystore.jceks") ; + private final String keystoreFile = ksFile.toURI().getPath(); private String[] argsCreate = {"create", "TestCredential001", "-value", "PassworD123", "-provider", "jceks://file@/" + keystoreFile}; private String[] argsDelete = {"delete", "TestCredential001", "-provider", "jceks://file@/" + keystoreFile}; private String url = "jceks://file@/" + keystoreFile; @@ -44,6 +46,19 @@ public class RangerCredentialProviderTest { @Before public void setup() throws Exception { int ret; + // + // adding a delete before creating a keystore + // + try { + if (ksFile != null) { + if (ksFile.exists()) { + ksFile.delete() ; + } + } + } + catch(Throwable t) { + } + Configuration conf = new Configuration(); CredentialShell cs = new CredentialShell(); cs.setConf(conf);
