[zeppelin] branch master updated: [HotFix] Fix frontend ci test

[zj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 0925ddd  [HotFix] Fix frontend ci test
0925ddd is described below

commit 0925ddd486ba737a7315e576c8f5a94740716179
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Mon Jul 19 15:52:36 2021 +0800

    [HotFix] Fix frontend ci test
---
 .../org/apache/zeppelin/integration/InterpreterModeActionsIT.java    | 2 +-
 .../java/org/apache/zeppelin/integration/ParagraphActionsIT.java     | 4 ++++
 .../test/java/org/apache/zeppelin/integration/SparkParagraphIT.java  | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/InterpreterModeActionsIT.java b/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/InterpreterModeActionsIT.java
index a0c2c2e..f69c22d 100644
--- a/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/InterpreterModeActionsIT.java
+++ b/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/InterpreterModeActionsIT.java
@@ -74,7 +74,7 @@ public class InterpreterModeActionsIT extends AbstractZeppelinIT {
 
   static String cmdPsPython = "ps aux | grep 'kernel_server.py' | grep -v 'grep' | wc -l";
   static String cmdPsInterpreter = "ps aux | grep 'zeppelin/interpreter/python/*' |" +
-      " sed -E '/grep|local-repo/d' | wc -l";
+          " sed -E '/grep/d' | wc -l";
 
   @BeforeClass
   public static void startUp() {
diff --git a/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
index 894abd2..6474044 100644
--- a/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
+++ b/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
@@ -388,6 +388,7 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
       driver.findElement(By.xpath(getParagraphXPath(1) + "//span[@class='icon-settings']")).click();
       clickAndWait(By.xpath(getParagraphXPath(1) +
           "//ul/li/a[@ng-click='clearParagraphOutput(paragraph)']"));
+      ZeppelinITUtils.sleep(1000, false);
       collector.checkThat("After Clear  Output field contains ",
           driver.findElements(By.xpath(xpathToOutputField)).size(),
           CoreMatchers.equalTo(0));
@@ -693,6 +694,7 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
 
       WebElement firstCheckbox = driver.findElement(By.xpath("(" + getParagraphXPath(1) + "//input[@type='checkbox'])[1]"));
       firstCheckbox.click();
+      ZeppelinITUtils.sleep(2000, false);
       collector.checkThat("After unchecking one of the boxes, we can see the newly updated output without the option we unchecked",
               driver.findElement(By.xpath(getParagraphXPath(1) + "//div[contains(@class, 'text plainTextContent')]")).getText(),
               CoreMatchers.containsString("Greetings leia and luke"));
@@ -702,6 +704,7 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
 
       WebElement secondCheckbox = driver.findElement(By.xpath("(" + getParagraphXPath(1) + "//input[@type='checkbox'])[2]"));
       secondCheckbox.click();
+      ZeppelinITUtils.sleep(2000, false);
       collector.checkThat("After 'Run on selection change' checkbox is unchecked, the paragraph should not run if check box state is modified",
               driver.findElement(By.xpath(getParagraphXPath(1) + "//div[contains(@class, 'text plainTextContent')]")).getText(),
               CoreMatchers.containsString("Greetings leia and luke"));
@@ -861,6 +864,7 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
       runParagraph(1);
       waitForParagraph(1, "FINISHED");
 
+      ZeppelinITUtils.sleep(1000, false);
       collector.checkThat("After run paragraph again, we can see the newly updated output",
           driver.findElement(By.xpath(getParagraphXPath(1) + "//div[contains(@class, 'text plainTextContent')]")).getText(),
           CoreMatchers.containsString("Greetings leia and luke"));
diff --git a/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/SparkParagraphIT.java b/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/SparkParagraphIT.java
index 5154126..05eb0a4 100644
--- a/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/SparkParagraphIT.java
+++ b/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/SparkParagraphIT.java
@@ -179,11 +179,12 @@ public class SparkParagraphIT extends AbstractZeppelinIT {
       collector.checkThat("First paragraph status is ",
               getParagraphStatus(1), CoreMatchers.equalTo("ABORT")
       );
+
       collector.checkThat("Second paragraph status is ",
-              getParagraphStatus(2), CoreMatchers.equalTo("READY")
+              getParagraphStatus(2), CoreMatchers.either(CoreMatchers.equalTo("PENDING"))
+                      .or(CoreMatchers.equalTo("READY"))
       );
 
-
       driver.navigate().refresh();
       ZeppelinITUtils.sleep(3000, false);