7.3.x E2E happy path tests fixup (#15010)

* Fix version of jar file in petclinic project of happy path tests (#14936) * Log and fix workaround to Java LS server initialization failure (#14945) Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com>
eclipse-che · Oct 29, 2019 · 12c5f01 · 12c5f01
1 parent 92e96be
commit 12c5f01
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/e2e/files/happy-path/happy-path-workspace.yaml b/e2e/files/happy-path/happy-path-workspace.yaml
@@ -53,17 +53,17 @@ commands:
     actions:
       - type: exec
         component: maven-container
-        command: java -jar spring-petclinic-2.1.0.BUILD-SNAPSHOT.jar --spring.profiles.active=mysql
+        command: java -jar spring-petclinic-2.2.0.BUILD-SNAPSHOT.jar --spring.profiles.active=mysql
         workdir: /projects/petclinic/target
   - name: run-with-changes
     actions:
       - type: exec
         component: maven-container
-        command: java -jar spring-petclinic-2.1.0.BUILD-SNAPSHOT.jar --spring.profiles.active=mysql
+        command: java -jar spring-petclinic-2.2.0.BUILD-SNAPSHOT.jar --spring.profiles.active=mysql
         workdir: /projects/petclinic/target
   - name: run-debug
     actions:
       - type: exec
         component: maven-container
-        command: java -jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044 spring-petclinic-2.1.0.BUILD-SNAPSHOT.jar --spring.profiles.active=mysql
+        command: java -jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044 spring-petclinic-2.2.0.BUILD-SNAPSHOT.jar --spring.profiles.active=mysql
         workdir: /projects/petclinic/target
diff --git a/e2e/pageobjects/ide/Ide.ts b/e2e/pageobjects/ide/Ide.ts
@@ -213,19 +213,8 @@ export class Ide {
 
     async checkLsInitializationStart(expectedTextInStatusBar: string) {
         Logger.debug('Ide.checkLsInitializationStart');
-
-        try {
-            await this.waitStatusBarContains(expectedTextInStatusBar, 20000);
-        } catch (err) {
-            if (!(err instanceof error.TimeoutError)) {
-                throw err;
-            }
-
-            await this.driverHelper.getDriver().navigate().refresh();
-            await this.waitAndSwitchToIdeFrame();
-            await this.waitStatusBarContains(expectedTextInStatusBar);
-        }
-
+
+        await this.waitStatusBarContains(expectedTextInStatusBar, 20000);
     }
 
     async closeAllNotifications() {

diff --git a/e2e/tests/e2e_happy_path/HappyPath.spec.ts b/e2e/tests/e2e_happy_path/HappyPath.spec.ts
@@ -93,7 +93,19 @@ suite('Language server validation', async () => {
     test('Java LS initialization', async () => {
         await projectTree.expandPathAndOpenFileInAssociatedWorkspace(pathToJavaFolder, javaFileName);
         await editor.selectTab(javaFileName);
-        await ide.checkLsInitializationStart('Starting Java Language Server');
+
+        try {
+            await ide.checkLsInitializationStart('Starting Java Language Server');
+        } catch (err) {
+            if (!(err instanceof error.TimeoutError)) {
+                throw err;
+            }
+
+            console.log("Known flakiness has occurred https://github.com/eclipse/che/issues/14944");
+            await driverHelper.reloadPage();
+            await ide.waitStatusBarContains('Starting Java Language Server');
+        }
+
         await ide.waitStatusBarTextAbsence('Starting Java Language Server', 1800000);
         await checkJavaPathCompletion();
         await ide.waitStatusBarTextAbsence('Building workspace', 360000);

diff --git a/e2e/utils/DriverHelper.ts b/e2e/utils/DriverHelper.ts
@@ -460,7 +460,7 @@ export class DriverHelper {
     }
 
     public async reloadPage() {
-        Logger.trace('DriverHelper.reloadPage');
+        Logger.debug('DriverHelper.reloadPage');
 
         await this.driver.navigate().refresh();
     }
@@ -473,7 +473,7 @@ export class DriverHelper {
     }
 
     public async navigateToUrl(url: string) {
-        Logger.trace(`DriverHelper.navigateToUrl ${url}`);
+        Logger.debug(`DriverHelper.navigateToUrl ${url}`);
 
         await this.driver.navigate().to(url);
     }
@@ -534,7 +534,7 @@ export class DriverHelper {
     }
 
     async switchToSecondWindow(mainWindowHandle: string) {
-        Logger.trace('DriverHelper.switchToSecondWindow');
+        Logger.debug('DriverHelper.switchToSecondWindow');
 
         await this.waitOpenningSecondWindow();
         const handles: string[] = await this.driver.getAllWindowHandles();