accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From md...@apache.org
Subject git commit: ACCUMULO-2555 Force use of known jline terminal
Date Wed, 26 Mar 2014 16:04:52 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT f3f54806d -> 9550296c8


ACCUMULO-2555 Force use of known jline terminal

Some Jenkins builds appear to be having trouble with auto-detecting a
JLine terminal, so we force it to unsupported (for minimal feature set).


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 9550296c82d338c3def77515dc665a18e3e90af9
Parents: f3f5480
Author: Mike Drob <mdrob@cloudera.com>
Authored: Wed Mar 26 11:36:43 2014 -0400
Committer: Mike Drob <mdrob@cloudera.com>
Committed: Wed Mar 26 11:36:43 2014 -0400

----------------------------------------------------------------------
 .../accumulo/core/util/format/DeleterFormatterTest.java     | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9550296c/core/src/test/java/org/apache/accumulo/core/util/format/DeleterFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/DeleterFormatterTest.java
b/core/src/test/java/org/apache/accumulo/core/util/format/DeleterFormatterTest.java
index 4daf676..36def05 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/DeleterFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/DeleterFormatterTest.java
@@ -35,6 +35,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 
+import jline.UnsupportedTerminal;
 import jline.console.ConsoleReader;
 
 import org.apache.accumulo.core.client.BatchWriter;
@@ -69,10 +70,6 @@ public class DeleterFormatterTest {
     public void set(String in) {
       bais = new ByteArrayInputStream(in.getBytes(UTF8));
     }
-
-    public void set(byte... in) {
-      bais = new ByteArrayInputStream(in);
-    }
   };
 
   @Before
@@ -91,7 +88,7 @@ public class DeleterFormatterTest {
 
     shellState = createNiceMock(Shell.class);
 
-    reader = new ConsoleReader(input, baos);
+    reader = new ConsoleReader(input, baos, new UnsupportedTerminal());
     expect(shellState.getReader()).andReturn(reader).anyTimes();
 
     replay(writer, exceptionWriter, shellState);
@@ -132,7 +129,7 @@ public class DeleterFormatterTest {
 
   @Test
   public void testNoConfirmation() throws IOException {
-    input.set((byte) -1);
+    input.set("");
     data.put(new Key("z"), new Value("v2".getBytes(UTF8)));
     formatter = new DeleterFormatter(writer, data.entrySet(), true, shellState, false);
 


Mime
View raw message