Merge pull request #2309 from zowe/system-tests-handle-proxy-v3

Handle Proxy during System Tests [v3]
zowe · Oct 17, 2024 · a1461ca · a1461ca
2 parents 13fa0fd + 4deb729
commit a1461ca
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/cli/__tests__/zosmf/__system__/check/status/zosmf.check.status.system.test.ts b/packages/cli/__tests__/zosmf/__system__/check/status/zosmf.check.status.system.test.ts
@@ -103,7 +103,7 @@ describe("zosmf check status", () => {
 
     describe("Expected failures", () => {
 
-        it("should fail due to invalid port", async () => {
+        (!process.env.HTTP_PROXY && !process.env.HTTPS_PROXY ? it : it.skip)("should fail due to invalid port", async () => {
             // update temporary zowe profile with an invalid port
             const scriptPath = testEnvironment.workingDir + "_create_profile_invalid_port";
             const bogusPort = 12345;

diff --git a/packages/cli/__tests__/zosmf/__system__/list/systems/zosmf.list.systems.system.test.ts b/packages/cli/__tests__/zosmf/__system__/list/systems/zosmf.list.systems.system.test.ts
@@ -121,7 +121,7 @@ describe("zosmf list systems", () => {
 
     describe("Expected failures", () => {
 
-        it("should fail due to invalid port", async () => {
+        (!process.env.HTTP_PROXY && !process.env.HTTPS_PROXY ? it : it.skip)("should fail due to invalid port", async () => {
             // update temporary zowe profile with an invalid port
             const scriptPath = testEnvironment.workingDir + "_create_profile_invalid_port";
             const bogusPort = 12345;

diff --git a/packages/zosmf/__tests__/__system__/methods/CheckStatus.system.test.ts b/packages/zosmf/__tests__/__system__/methods/CheckStatus.system.test.ts
@@ -69,7 +69,7 @@ describe("Check Status Api", () => {
             expect(error.message).toContain(ZosmfMessages.missingSession.message);
         });
 
-        it("should return with proper message for invalid hostname", async () => {
+        (!process.env.HTTP_PROXY && !process.env.HTTPS_PROXY ? it : it.skip)("should return with proper message for invalid hostname", async () => {
             const badHostName = "badHost";
             const badSession = new Session({
                 user: defaultSystem.zosmf.user,
@@ -98,7 +98,7 @@ describe("Check Status Api", () => {
             expect(jsonCauseErrors.hostname).toEqual(badHostName);
         });
 
-        it("should return with proper message for invalid port", async () => {
+        (!process.env.HTTP_PROXY && !process.env.HTTPS_PROXY ? it : it.skip)("should return with proper message for invalid port", async () => {
             const badPort = 51342;
             const badSession = new Session({
                 user: defaultSystem.zosmf.user,

diff --git a/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts b/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts
@@ -69,7 +69,7 @@ describe("List Defined Systems Api", () => {
             expect(error.message).toContain(ZosmfMessages.missingSession.message);
         });
 
-        it("should return with proper message for invalid hostname", async () => {
+        (!process.env.HTTP_PROXY && !process.env.HTTPS_PROXY ? it : it.skip)("should return with proper message for invalid hostname", async () => {
             const badHostName = "badHost";
             const badSession = new Session({
                 user: defaultSystem.zosmf.user,
@@ -98,7 +98,7 @@ describe("List Defined Systems Api", () => {
             expect(jsonCauseErrors.hostname).toEqual(badHostName);
         });
 
-        it("should return with proper message for invalid port", async () => {
+        (!process.env.HTTP_PROXY && !process.env.HTTPS_PROXY ? it : it.skip)("should return with proper message for invalid port", async () => {
             const badPort = 9999;
             const badSession = new Session({
                 user: defaultSystem.zosmf.user,