Try to make the ExternalTerminalTest more robust

jline · Jun 22, 2017 · d5695a1 · d5695a1
1 parent 6962db9
commit d5695a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/reader/src/test/java/org/jline/terminal/impl/ExternalTerminalTest.java b/reader/src/test/java/org/jline/terminal/impl/ExternalTerminalTest.java
@@ -92,6 +92,7 @@ public void run() {
                     outIn.flush();
                     Thread.sleep(50);
                     outIn.write(3);
+                    Thread.sleep(50);
                     outIn.write('c');
                     outIn.flush();
                     Thread.sleep(50);

diff --git a/terminal/src/main/java/org/jline/utils/NonBlockingReader.java b/terminal/src/main/java/org/jline/utils/NonBlockingReader.java
@@ -168,6 +168,9 @@ else if (!isPeek && timeout <= 0L && !threadIsReading) {
                 long start = System.currentTimeMillis ();
 
                 try {
+                    if (Thread.interrupted()) {
+                        throw new InterruptedException();
+                    }
                     wait(timeout);
                 }
                 catch (InterruptedException e) {