From f1955d6d55539195c31bf99a7a2fa5256a7350aa Mon Sep 17 00:00:00 2001
From: Patrick Seidensal <pseidensal@suse.com>
Date: Fri, 16 Aug 2019 14:39:35 +0200
Subject: [PATCH] mgr/dashboard: migrate E2E Helper to async/await

Fixes: https://tracker.ceph.com/issues/40693

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
---
 .../mgr/dashboard/frontend/e2e/helper.po.ts   | 62 ++++---------------
 1 file changed, 11 insertions(+), 51 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
index e0891edaf46..ac24fa3909d 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
@@ -1,18 +1,5 @@
 import { browser } from 'protractor';
 import { ImagesPageHelper } from './block/images.po';
-import { IscsiPageHelper } from './block/iscsi.po';
-import { MirroringPageHelper } from './block/mirroring.po';
-import { AlertsPageHelper } from './cluster/alerts.po';
-import { ConfigurationPageHelper } from './cluster/configuration.po';
-import { CrushMapPageHelper } from './cluster/crush-map.po';
-import { HostsPageHelper } from './cluster/hosts.po';
-import { LogsPageHelper } from './cluster/logs.po';
-import { ManagerModulesPageHelper } from './cluster/mgr-modules.po';
-import { MonitorsPageHelper } from './cluster/monitors.po';
-import { OSDsPageHelper } from './cluster/osds.po';
-import { DashboardPageHelper } from './dashboard.po';
-import { FilesystemsPageHelper } from './filesystems/filesystems.po';
-import { NfsPageHelper } from './nfs/nfs.po';
 import { PoolPageHelper } from './pools/pools.po';
 import { BucketsPageHelper } from './rgw/buckets.po';
 import { DaemonsPageHelper } from './rgw/daemons.po';
@@ -23,20 +10,8 @@ export class Helper {
   static EC = browser.ExpectedConditions;
   static TIMEOUT = 10000;
 
-  buckets: BucketsPageHelper;
-  daemons: DaemonsPageHelper;
-  users: UsersPageHelper;
   pools: PoolPageHelper;
-  nfs: NfsPageHelper;
-  filesystems: FilesystemsPageHelper;
-  alerts: AlertsPageHelper;
-  configuration: ConfigurationPageHelper;
-  crushmap: CrushMapPageHelper;
-  hosts: HostsPageHelper;
-  logs: LogsPageHelper;
-  mgrmodules: ManagerModulesPageHelper;
-  monitors: MonitorsPageHelper;
-  osds: OSDsPageHelper;
+  buckets: BucketsPageHelper;
   images: ImagesPageHelper;
   iscsi: IscsiPageHelper;
   mirroring: MirroringPageHelper;
@@ -44,20 +19,8 @@ export class Helper {
   usermgmt: UserMgmtPageHelper;
 
   constructor() {
-    this.buckets = new BucketsPageHelper();
-    this.daemons = new DaemonsPageHelper();
-    this.users = new UsersPageHelper();
     this.pools = new PoolPageHelper();
-    this.nfs = new NfsPageHelper();
-    this.filesystems = new FilesystemsPageHelper();
-    this.alerts = new AlertsPageHelper();
-    this.configuration = new ConfigurationPageHelper();
-    this.crushmap = new CrushMapPageHelper();
-    this.hosts = new HostsPageHelper();
-    this.logs = new LogsPageHelper();
-    this.mgrmodules = new ManagerModulesPageHelper();
-    this.monitors = new MonitorsPageHelper();
-    this.osds = new OSDsPageHelper();
+    this.buckets = new BucketsPageHelper();
     this.images = new ImagesPageHelper();
     this.iscsi = new IscsiPageHelper();
     this.mirroring = new MirroringPageHelper();
@@ -71,21 +34,18 @@ export class Helper {
    * @static
    * @memberof Helper
    */
-  static checkConsole() {
-    browser
+  static async checkConsole() {
+    let browserLog = await browser
       .manage()
       .logs()
-      .get('browser')
-      .then(function(browserLog) {
-        browserLog = browserLog.filter((log) => {
-          return log.level.value > 900; // SEVERE level
-        });
+      .get('browser');
+
+    browserLog = browserLog.filter((log) => log.level.value > 900);
 
-        if (browserLog.length > 0) {
-          console.log('\n log: ' + require('util').inspect(browserLog));
-        }
+    if (browserLog.length > 0) {
+      console.log('\n log: ' + require('util').inspect(browserLog));
+    }
 
-        expect(browserLog.length).toEqual(0);
-      });
+    expect(browserLog.length).toEqual(0);
   }
 }
-- 
2.39.5