You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2017/01/20 23:13:36 UTC
zeppelin git commit: [ZEPPELIN-1455] Fix flaky test:
AbstractAngularElemTest
Repository: zeppelin
Updated Branches:
refs/heads/master f604dffa3 -> 99c21c4ed
[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 <mo...@apache.org>
Closes #1920 from Leemoonsoo/ZEPPELIN-1455 and squashes the following commits:
13a993d [Lee moon soo] Increase tolerance of eventually
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/99c21c4e
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/99c21c4e
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/99c21c4e
Branch: refs/heads/master
Commit: 99c21c4edab8f588e57b95c27e957b8bb882560f
Parents: f604dff
Author: Lee moon soo <mo...@apache.org>
Authored: Fri Jan 20 13:26:25 2017 -0800
Committer: Lee moon soo <mo...@apache.org>
Committed: Fri Jan 20 15:13:33 2017 -0800
----------------------------------------------------------------------
.../zeppelin/display/angular/AbstractAngularElemTest.scala | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99c21c4e/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")}
}