Repository: zeppelin Updated Branches: refs/heads/master 41c74f59a -> 867facb6e
[ZEPPELIN-1110] Catch Exception in ZeppelinIT. testSparkInterpreterDependencyLoading ### What is this PR for? Catch Exception in case dialog is removed from dom to fix flaky test of `ZeppelinIT. testSparkInterpreterDependencyLoading` ### What type of PR is it? Hot Fix ### What is the Jira issue? [ZEPPELIN-1110](https://issues.apache.org/jira/browse/ZEPPELIN-1110) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Mina Lee <[email protected]> Closes #1129 from minahlee/ZEPPELIN-1110 and squashes the following commits: c681410 [Mina Lee] Retrigger CI 69da3c1 [Mina Lee] Retrigger CI 21435be [Mina Lee] Retrigger CI 8cd7065 [Mina Lee] catch StaleElementReferenceException in case dialog is removed from dom Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/867facb6 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/867facb6 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/867facb6 Branch: refs/heads/master Commit: 867facb6e42a4b84e1d3612a827438964f6ee789 Parents: 41c74f5 Author: Mina Lee <[email protected]> Authored: Tue Jul 5 15:00:56 2016 +0900 Committer: Mina Lee <[email protected]> Committed: Tue Jul 5 16:05:41 2016 +0900 ---------------------------------------------------------------------- .travis.yml | 1 - .../src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/867facb6/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 19a05cb..8ea1a40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,6 @@ before_script: script: - mvn $TEST_FLAG $PROFILE -B $TEST_PROJECTS - after_success: - echo "Travis exited with ${TRAVIS_TEST_RESULT}" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/867facb6/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java index 60ec641..b7b8ea2 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java @@ -28,6 +28,7 @@ import org.junit.Test; import org.junit.rules.ErrorCollector; import org.openqa.selenium.By; import org.openqa.selenium.Keys; +import org.openqa.selenium.StaleElementReferenceException; import org.openqa.selenium.TimeoutException; import org.openqa.selenium.WebElement; import org.slf4j.Logger; @@ -218,7 +219,7 @@ public class ZeppelinIT extends AbstractZeppelinIT { clickAndWait(By.xpath("//div[@class='modal-dialog'][contains(.,'Do you want to " + "update this interpreter and restart with new settings?')]//" + "div[@class='bootstrap-dialog-close-button']/button")); - } catch (TimeoutException e) { + } catch (TimeoutException | StaleElementReferenceException e) { //Modal dialog got closed earlier than expected nothing to worry. }
