You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/04/19 16:51:41 UTC
svn commit: r1469860 - in /accumulo/branches/1.5:
core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Author: kturner
Date: Fri Apr 19 14:51:40 2013
New Revision: 1469860
URL: http://svn.apache.org/r1469860
Log:
ACCUMULO-1323 made shell behave the way it did in 1.4 when no user was given and fixed shell unit test
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1469860&r1=1469859&r2=1469860&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Fri Apr 19 14:51:40 2013
@@ -245,7 +245,7 @@ public class Shell extends ShellOptions
String sysUser = System.getProperty("user.name");
if (sysUser == null)
sysUser = "root";
- String user = cl.getOptionValue(usernameOption.getOpt());
+ String user = cl.getOptionValue(usernameOption.getOpt(), sysUser);
String passw = cl.getOptionValue(passwOption.getOpt(), null);
tabCompletion = !cl.hasOption(tabCompleteOption.getLongOpt());
Modified: accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1469860&r1=1469859&r2=1469860&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java (original)
+++ accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Fri Apr 19 14:51:40 2013
@@ -622,12 +622,12 @@ public class ShellServerTest {
exec("createtable t");
exec("addsplits a m z");
exec("getsplits", true, "z", true);
- exec("merge -f", true);
+ exec("merge --all", true);
exec("getsplits", true, "z", false);
exec("deletetable -f t");
exec("getsplits -t !METADATA", true);
assertEquals(3, output.get().split("\n").length);
- exec("merge -f -t !METADATA");
+ exec("merge --all -t !METADATA");
exec("getsplits -t !METADATA", true);
assertEquals(2, output.get().split("\n").length);
}