zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject zeppelin git commit: [ZEPPELIN-2007] Fix flaky test: ShellInterpreterTest#testShellTimeout
Date Tue, 24 Jan 2017 18:28:57 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master e43585805 -> 2ef835915


[ZEPPELIN-2007] Fix flaky test: ShellInterpreterTest#testShellTimeout

### What is this PR for?
Fix flaky test ShellInterpreterTest#testShellTimeout https://issues.apache.org/jira/browse/ZEPPELIN-2007

this PR makes sure `testShellTimeout()` produce timeout error by increase gap between timeout
and test value (from `61-60 = 1`  to `4-2 = 2`).

### What type of PR is it?
Hot Fix

### Todos
* [x] - Fix

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2007

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: Lee moon soo <moon@apache.org>

Closes #1939 from Leemoonsoo/ZEPPELIN-2007 and squashes the following commits:

57c6a9b [Lee moon soo] Make ShellInterpreterTest faster, more reliable


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2ef83591
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2ef83591
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2ef83591

Branch: refs/heads/master
Commit: 2ef835915aafb1ab72fc5e61248d13e39bdca355
Parents: e435858
Author: Lee moon soo <moon@apache.org>
Authored: Tue Jan 24 09:45:51 2017 -0800
Committer: Lee moon soo <moon@apache.org>
Committed: Tue Jan 24 10:28:49 2017 -0800

----------------------------------------------------------------------
 .../java/org/apache/zeppelin/shell/ShellInterpreterTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2ef83591/shell/src/test/java/org/apache/zeppelin/shell/ShellInterpreterTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/zeppelin/shell/ShellInterpreterTest.java b/shell/src/test/java/org/apache/zeppelin/shell/ShellInterpreterTest.java
index a882394..b369f2d 100644
--- a/shell/src/test/java/org/apache/zeppelin/shell/ShellInterpreterTest.java
+++ b/shell/src/test/java/org/apache/zeppelin/shell/ShellInterpreterTest.java
@@ -38,7 +38,7 @@ public class ShellInterpreterTest {
   @Before
   public void setUp() throws Exception {
     Properties p = new Properties();
-    p.setProperty("shell.command.timeout.millisecs", "60000");
+    p.setProperty("shell.command.timeout.millisecs", "2000");
     shell = new ShellInterpreter(p);
 
     context = new InterpreterContext("", "1", null, "", "", null, null, null, null, null,
null, null);
@@ -77,9 +77,9 @@ public class ShellInterpreterTest {
   @Test
   public void testShellTimeout() {
     if (System.getProperty("os.name").startsWith("Windows")) {
-      result = shell.interpret("timeout 61", context);
+      result = shell.interpret("timeout 4", context);
     } else {
-      result = shell.interpret("sleep 61", context);
+      result = shell.interpret("sleep 4", context);
     }
 
     assertEquals(Code.INCOMPLETE, result.code());


Mime
View raw message