Repository: zeppelin Updated Branches: refs/heads/branch-0.8 574de381a -> 3b3ce9ed8
ZEPPELIN-3277. NotebookServerTest.testMakeSureNoAngularObjectBroadcastToWebsocketWhoFireTheEvent fails ### What is this PR for? Trivial fix for flaky test, see the comment for details. ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3277 ### How should this be tested? * CI pass ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang <zjf...@apache.org> Closes #2838 from zjffdu/ZEPPELIN-3277 and squashes the following commits: 68827d7 [Jeff Zhang] ZEPPELIN-3277. NotebookServerTest.testMakeSureNoAngularObjectBroadcastToWebsocketWhoFireTheEvent fails (cherry picked from commit c77c549e3f6bfa7b08ebc0bfaacb2bd8719c875f) Signed-off-by: Jeff Zhang <zjf...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3b3ce9ed Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3b3ce9ed Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3b3ce9ed Branch: refs/heads/branch-0.8 Commit: 3b3ce9ed817273807959a97340598b8dc06d8f96 Parents: 574de38 Author: Jeff Zhang <zjf...@apache.org> Authored: Mon Mar 5 15:52:14 2018 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Tue Mar 6 12:52:49 2018 +0800 ---------------------------------------------------------------------- .../test/java/org/apache/zeppelin/socket/NotebookServerTest.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3b3ce9ed/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java index a0cb587..0b68ca6 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java @@ -123,6 +123,8 @@ public class NotebookServerTest extends AbstractTestRestApi { } Thread.sleep(100); } + // sleep for 1 second to make sure job running thread finish to fire event. See ZEPPELIN-3277 + Thread.sleep(1000); // add angularObject interpreterGroup.getAngularObjectRegistry().add("object1", "value1", note1.getId(), null);
