accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [8/8] accumulo git commit: Merge branch '1.8'
Date Thu, 21 Jul 2016 20:57:46 GMT
Merge branch '1.8'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/29e0ffd3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29e0ffd3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/29e0ffd3

Branch: refs/heads/master
Commit: 29e0ffd390364e5f36f13736b35b7af71ad90d10
Parents: 10d29ad 7a47b18
Author: Josh Elser <elserj@apache.org>
Authored: Thu Jul 21 16:55:54 2016 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Jul 21 16:55:54 2016 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/shell/Shell.java | 13 ++++++++-----
 .../org/apache/accumulo/shell/ShellConfigTest.java     | 10 +++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/29e0ffd3/shell/src/main/java/org/apache/accumulo/shell/Shell.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/29e0ffd3/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
----------------------------------------------------------------------
diff --cc shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
index 1e0a240,8bef14d..5e8736c
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
@@@ -121,22 -102,19 +121,22 @@@ public class ShellConfigTest 
      assertTrue("Did not print usage", output.get().startsWith("Usage"));
    }
  
 +  @Ignore
    @Test
-   public void testTokenWithoutOptions() {
+   public void testTokenWithoutOptions() throws IOException {
      assertFalse(shell.config(args("--fake", "-tc", PasswordToken.class.getName())));
      assertFalse(output.get().contains(ParameterException.class.getName()));
    }
  
 +  @Ignore
    @Test
-   public void testTokenAndOption() {
+   public void testTokenAndOption() throws IOException {
      assertTrue(shell.config(args("--fake", "-tc", PasswordToken.class.getName(), "-u", "foo",
"-l", "password=foo")));
    }
  
 +  @Ignore
    @Test
-   public void testTokenAndOptionAndPassword() {
+   public void testTokenAndOptionAndPassword() throws IOException {
      assertFalse(shell.config(args("--fake", "-tc", PasswordToken.class.getName(), "-l",
"password=foo", "-p", "bar")));
      assertTrue(output.get().contains(ParameterException.class.getName()));
    }


Mime
View raw message