Merge branch 'v3.x/staging' into v3.x/feature/checkFSforNOSUID

zowe · Sep 17, 2024 · 1715341 · 1715341
2 parents 210a83f + 369de92
commit 1715341
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/tests/sanity/test/e2e/test-01-login.js b/tests/sanity/test/e2e/test-01-login.js
@@ -15,12 +15,12 @@ const addContext = require('mochawesome/addContext');
 const testName = path.basename(__filename, path.extname(__filename));
 
 const {
-  PRE_INSTALLED_APPS,
-  PRE_INSTALLED_APPS_DISABLED_FOR_DOCKER,
-  PRE_PINNED_APPS,
+// PRE_INSTALLED_APPS,
+// PRE_INSTALLED_APPS_DISABLED_FOR_DOCKER,
+// PRE_PINNED_APPS,
   DEFAULT_PAGE_LOADING_TIMEOUT,
   DEFAULT_ELEMENT_CHECK_INTERVAL,
-  getElements,
+  // getElements,
   getElement,
   getElementText,
   waitUntilElement,
@@ -252,8 +252,12 @@ describe('test MVD login page', function() {
     expect(launchbar).to.be.an('object');
 
     // check we have known apps launched
-    const apps = await getElements(driver, 'rs-com-launchbar-icon');
+
+
+    /*const apps = await getElements(driver, 'rs-com-launchbar-icon');
     expect(apps).to.be.an('array').that.have.lengthOf(PRE_PINNED_APPS.length);
+
+    */
     // FIXME: ignore the title check now since title has been changed to show plugin description
     // for (let app of apps) {
     //   const icon = await getElement(app, 'div.launchbar-icon-image');
@@ -265,8 +269,8 @@ describe('test MVD login page', function() {
     loginSuccessfully = true;
   });
 
-  const zosHost = process.env.ZOWE_ZOS_HOST || process.env.ZOWE_EXTERNAL_HOST;
-  const dockerTest = process.env.ZOWE_EXTERNAL_HOST !== zosHost;
+  // const zosHost = process.env.ZOWE_ZOS_HOST || process.env.ZOWE_EXTERNAL_HOST;
+  // const dockerTest = process.env.ZOWE_EXTERNAL_HOST !== zosHost;
 
   it('should be able to popup apps menu', async function() {
     if (!loginSuccessfully) {
@@ -293,7 +297,7 @@ describe('test MVD login page', function() {
     expect(popup).to.be.an('object');
 
     // check popup menu items
-    const menuItems = await getElements(popup, '.launch-widget-row > .app-label');
+    /* const menuItems = await getElements(popup, '.launch-widget-row > .app-label');
 
     if (dockerTest) {
       // Docker scenario will not have IP Explorer, thus installed apps should be one less the total count
@@ -305,7 +309,7 @@ describe('test MVD login page', function() {
     for (let item of menuItems) {
       const text = await item.getText();
       expect(text).to.be.oneOf(PRE_INSTALLED_APPS);
-    }
+    }*/
   });
 
 

diff --git a/tests/sanity/test/e2e/test-05-tn3270.js b/tests/sanity/test/e2e/test-05-tn3270.js
@@ -8,6 +8,7 @@
  * Copyright IBM Corporation 2018, 2019
  */
 
+/*
 const path = require('path');
 const expect = require('chai').expect;
 const debug = require('debug')('zowe-sanity-test:e2e:tn3270');
@@ -99,3 +100,4 @@ describe(`test ${APP_TO_TEST}`, function() {
     }
   });
 });
+*/
diff --git a/tests/sanity/test/e2e/test-09-editor.js b/tests/sanity/test/e2e/test-09-editor.js
@@ -7,7 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
-
+/*
 const path = require('path');
 const expect = require('chai').expect;
 const debug = require('debug')('zowe-sanity-test:e2e:editor');
@@ -89,3 +89,4 @@ describe(`test ${APP_TO_TEST}`, function() {
     }
   });
 });
+*/