Repository: zeppelin Updated Branches: refs/heads/branch-0.7 792687182 -> 12763f9ca
[ZEPPELIN-1455] Fix flaky test: AbstractAngularElemTest ### What is this PR for? This PR fix flaky test [ZEPPELIN-1455](https://issues.apache.org/jira/browse/ZEPPELIN-1455). According to http://doc.scalatest.org/1.8/org/scalatest/concurrent/Eventually.html, default timeout of eventually is 150millisecond. Set enough timeout for the test. ### What type of PR is it? Hot Fix ### Todos * [x] - increase timeout ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1455 ### 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 <m...@apache.org> Closes #1920 from Leemoonsoo/ZEPPELIN-1455 and squashes the following commits: 13a993d [Lee moon soo] Increase tolerance of eventually (cherry picked from commit 99c21c4edab8f588e57b95c27e957b8bb882560f) Signed-off-by: Mina Lee <mina...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/12763f9c Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/12763f9c Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/12763f9c Branch: refs/heads/branch-0.7 Commit: 12763f9ca68ad803974df809d0fa7b8e47b54a24 Parents: 7926871 Author: Lee moon soo <m...@apache.org> Authored: Fri Jan 20 13:26:25 2017 -0800 Committer: Mina Lee <mina...@apache.org> Committed: Mon Jan 23 21:07:49 2017 +0900 ---------------------------------------------------------------------- .../zeppelin/display/angular/AbstractAngularElemTest.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/12763f9c/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala ---------------------------------------------------------------------- diff --git a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala index de8c6d0..43ad1bd 100644 --- a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala +++ b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala @@ -23,6 +23,7 @@ import org.apache.zeppelin.display.{AngularObject, AngularObjectRegistry, GUI} import org.apache.zeppelin.interpreter._ import org.apache.zeppelin.user.AuthenticationInfo import org.scalatest.concurrent.Eventually +import org.scalatest.time.{Seconds, Span} import org.scalatest.{BeforeAndAfter, BeforeAndAfterEach, FlatSpec, Matchers} /** @@ -61,12 +62,12 @@ trait AbstractAngularElemTest // click create thread for callback function to run. So it'll may not immediately invoked // after click. therefore eventually should be click(elem) - eventually { + eventually (timeout(Span(5, Seconds))) { a should be(1) } click(elem) - eventually { + eventually (timeout(Span(5, Seconds))) { a should be(2) } @@ -120,7 +121,7 @@ trait AbstractAngularElemTest click(elem) - eventually { modelValue should be("value")} + eventually (timeout(Span(5, Seconds))) { modelValue should be("value")} }
