From: Tiago Melo <tmelo@suse.com>
Date: Tue, 3 Sep 2019 10:53:05 +0000 (+0000)
Subject: mgr/dashboard: Fix random failure in images e2e test
X-Git-Tag: v15.1.0~1598^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe50d15139124638fea1b1053df5bb8c0c4e71ab;p=ceph-ci.git

mgr/dashboard: Fix random failure in images e2e test

Signed-off-by: Tiago Melo <tmelo@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/block/images.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/block/images.po.ts
index ec7f7723d31..73ef05fcebd 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/block/images.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/block/images.po.ts
@@ -29,7 +29,7 @@ export class ImagesPageHelper extends PageHelper {
 
     // Click the create button and wait for image to be made
     await element(by.cssContainingText('button', 'Create RBD')).click();
-    await this.waitPresence(this.getFirstTableCellWithText(name));
+    return this.waitPresence(this.getFirstTableCellWithText(name));
   }
 
   async editImage(name, pool, newName, newSize) {
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.po.ts
index 6bee8eb316a..c9e3ba6ff4b 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.po.ts
@@ -1,8 +1,6 @@
-import { $, $$, browser, by, element, protractor } from 'protractor';
+import { $, $$, by, element, protractor } from 'protractor';
 import { PageHelper } from '../page-helper.po';
 
-browser.ignoreSynchronization = true;
-
 export class LogsPageHelper extends PageHelper {
   pages = { index: '/#/logs' };
 
diff --git a/src/pybind/mgr/dashboard/frontend/protractor.conf.js b/src/pybind/mgr/dashboard/frontend/protractor.conf.js
index 3e2d1332d5f..653e83fa8ed 100644
--- a/src/pybind/mgr/dashboard/frontend/protractor.conf.js
+++ b/src/pybind/mgr/dashboard/frontend/protractor.conf.js
@@ -53,6 +53,7 @@ const config = {
 
 config.onPrepare = async () => {
   await browser.manage().timeouts().implicitlyWait(config.implicitWaitTimeout);
+  await browser.waitForAngularEnabled(false);
 
   require('ts-node').register({
     project: 'e2e/tsconfig.e2e.json'