Merge pull request #2339 from zowe/fix-system-tests-for-mac

Fix system tests for mac
zowe · Nov 1, 2024 · 952c1ac · 952c1ac
2 parents 97402aa + dbe3e4a
commit 952c1ac
Show file tree

Hide file tree

Showing 54 changed files with 477 additions and 257 deletions.
diff --git a/__tests__/__resources__/properties/default_properties.yaml b/__tests__/__resources__/properties/default_properties.yaml
@@ -104,6 +104,8 @@ zosjobs:
   modifiedJobclass: B
   # System affinity
   sysaff: zosjobs-sysaff
+  # CIM Support
+  skipCIM: false
 #-----------------------------------------------------------------------------#
 #  Set of properties for testing provisioning                                 #
 #-----------------------------------------------------------------------------#

diff --git a/__tests__/__src__/properties/ITestZosJobsSchema.ts b/__tests__/__src__/properties/ITestZosJobsSchema.ts
@@ -16,4 +16,5 @@ export interface ITestZosJobsSchema {
     jobclass: string;
     modifiedJobclass: string;
     sysaff: string;
+    skipCIM?: boolean;
 }
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Zowe CLI package will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Fixed an issue where the `zowe zos-logs list logs` command could fail or not return all logs if a start time was not supplied. [#2336](https://github.com/zowe/zowe-cli/pull/2336)
+
 ## `8.6.0`
 
 - Enhancement: Added support for running applications on TSO/E address spaces. Start applications and receive/transmit messages using the new `tso start`, `tso receive` and `tso send` commands. [#2280](https://github.com/zowe/zowe-cli/pull/2280)

diff --git a/packages/cli/__tests__/config/auto-init/__system__/__scripts__/config_auto_init.sh b/packages/cli/__tests__/config/auto-init/__system__/__scripts__/config_auto_init.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 
 HOST=$1

diff --git a/packages/cli/__tests__/config/auto-init/__system__/__scripts__/config_auto_init_cert.sh b/packages/cli/__tests__/config/auto-init/__system__/__scripts__/config_auto_init_cert.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 
 HOST=$1

diff --git a/packages/cli/__tests__/config/auto-init/__system__/__scripts__/config_auto_init_profile.sh b/packages/cli/__tests__/config/auto-init/__system__/__scripts__/config_auto_init_profile.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 
 zowe config auto-init

diff --git a/packages/cli/__tests__/config/auto-init/__system__/cli.config.auto-init.system.test.ts b/packages/cli/__tests__/config/auto-init/__system__/cli.config.auto-init.system.test.ts
@@ -45,6 +45,7 @@ describe("config auto-init without profile", () => {
                 base.rejectUnauthorized
             ]
         );
+        expect(response.status).toEqual(0);
 
         const config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
         // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42
@@ -107,6 +108,7 @@ describe("config auto-init without profile", () => {
                 base.rejectUnauthorized
             ]
         );
+        expect(response.status).toEqual(0);
 
         config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
         // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42
@@ -186,6 +188,7 @@ describe("config auto-init without profile and with certificates", () => {
                     base.rejectUnauthorized
                 ]
             );
+            expect(response.status).toEqual(0);
 
             const config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
             // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42
@@ -254,6 +257,7 @@ describe("config auto-init without profile and with certificates", () => {
                     base.rejectUnauthorized
                 ]
             );
+            expect(response.status).toEqual(0);
 
             config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
             // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42
@@ -319,6 +323,7 @@ describe("config auto-init with profile", () => {
 
     it("should successfully issue the auto-init command", () => {
         const response = runCliScript(__dirname + "/__scripts__/config_auto_init_profile.sh", TEST_ENVIRONMENT);
+        expect(response.status).toEqual(0);
 
         const config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
         // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42
@@ -379,6 +384,7 @@ describe("config auto-init with profile and certificates", () => {
 
     it("should successfully issue the auto-init command", () => {
         const response = runCliScript(__dirname + "/__scripts__/config_auto_init_profile.sh", TEST_ENVIRONMENT);
+        expect(response.status).toEqual(0);
 
         const config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
         // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42

diff --git a/packages/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job.sh b/packages/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job.sh
@@ -16,6 +16,8 @@ then
     exit $RC
 fi
 
+sleep 1
+
 # Cancel the job
 zowe jobs cancel job $JOBID
 RC=$?

diff --git a/...ges/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_fully_qualified.sh b/...ges/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_fully_qualified.sh
@@ -22,6 +22,8 @@ then
     exit $RC
 fi
 
+sleep 1
+
 # Cancel the job
 zowe jobs cancel job $JOBID --host $HOST --port $PORT --user $USER --password $PASS --ru=false
 RC=$?

diff --git a/packages/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_v1.sh b/packages/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_v1.sh
@@ -16,6 +16,8 @@ then
     exit $RC
 fi
 
+sleep 1
+
 # Cancel the job 1
 zowe jobs cancel job $JOBID --modify-version 1.0
 RC=$?

diff --git a/.../cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_v1_fully_qualified.sh b/.../cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_v1_fully_qualified.sh
@@ -22,6 +22,8 @@ then
     exit $RC
 fi
 
+sleep 1
+
 # Cancel the job
 zowe jobs cancel job $JOBID --host $HOST --port $PORT --user $USER --password $PASS --ru=false --modify-version 1.0
 RC=$?

diff --git a/packages/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_v2.sh b/packages/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_v2.sh
@@ -16,6 +16,8 @@ then
     exit $RC
 fi
 
+sleep 1
+
 # Cancel the job 1
 zowe jobs cancel job $JOBID --modify-version 2.0
 RC=$?

diff --git a/packages/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_v2_bad.sh b/packages/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_v2_bad.sh
@@ -16,6 +16,8 @@ then
     exit $RC
 fi
 
+sleep 1
+
 # Cancel the job 1
 zowe jobs cancel job $JOBID --modify-version 2.0
 RC=$?
@@ -26,6 +28,8 @@ then
     exit $RC
 fi
 
+sleep 1
+
 # Cancel the job 2
 zowe jobs cancel job $JOBID --modify-version 2.0
 RC=$?

diff --git a/.../cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_v2_fully_qualified.sh b/.../cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job_v2_fully_qualified.sh
@@ -22,6 +22,8 @@ then
     exit $RC
 fi
 
+sleep 1
+
 # Cancel the job
 zowe jobs cancel job $JOBID --host $HOST --port $PORT --user $USER --password $PASS --ru=false --modify-version 2.0
 RC=$?

diff --git a/packages/cli/__tests__/zosjobs/__system__/cancel/cli.zos-jobs.cancel.job.system.test.ts b/packages/cli/__tests__/zosjobs/__system__/cancel/cli.zos-jobs.cancel.job.system.test.ts
@@ -21,6 +21,7 @@ let TEST_ENVIRONMENT: ITestEnvironment<ITestPropertiesSchema>;
 const LOCAL_JCL_FILE: string = __dirname + "/" + "testFileOfLocalJCL.txt";
 const jobDataRegexV1 = /Successfully submitted request to cancel job (\w+) \((JOB\d+)\)/;
 const jobDataRegex = /Successfully canceled job (\w+) \((JOB\d+)\)/;
+const modifyVersionDefaultUsesCIM = false;
 
 describe("zos-jobs cancel job command", () => {
     // Create the unique test environment
@@ -73,13 +74,17 @@ describe("zos-jobs cancel job command", () => {
 
     describe("successful scenario", () => {
         it("should cancel a job v1", () => {
-            const response = runCliScript(__dirname + "/__scripts__/job/cancel_job_v1.sh", TEST_ENVIRONMENT, [LOCAL_JCL_FILE]);
-            expect(response.stderr.toString()).toBe("");
-            expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Successfully submitted request to cancel job");
+            if (TEST_ENVIRONMENT.systemTestProperties.zosjobs.skipCIM) {
+                process.stdout.write("Skipping test because skipCIM is set.");
+            } else {
+                const response = runCliScript(__dirname + "/__scripts__/job/cancel_job_v1.sh", TEST_ENVIRONMENT, [LOCAL_JCL_FILE]);
+                expect(response.stderr.toString()).toBe("");
+                expect(response.status).toBe(0);
+                expect(response.stdout.toString()).toContain("Successfully submitted request to cancel job");
 
-            const jobid = response.stdout.toString().match(jobDataRegexV1).pop();
-            TEST_ENVIRONMENT.resources.jobs.push(jobid);
+                const jobid = response.stdout.toString().match(jobDataRegexV1).pop();
+                TEST_ENVIRONMENT.resources.jobs.push(jobid);
+            }
         });
 
         it("should cancel a job v2", () => {
@@ -94,15 +99,19 @@ describe("zos-jobs cancel job command", () => {
         });
 
         it("should cancel a job default", () => {
-            const response = runCliScript(__dirname + "/__scripts__/job/cancel_job.sh", TEST_ENVIRONMENT, [LOCAL_JCL_FILE]);
-            expect(response.stderr.toString()).toBe("");
-            expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Successfully canceled job");
-            expect(response.stdout.toString()).not.toContain("Failed to cancel job");
-            expect(response.stdout.toString()).not.toContain("Failed to cancel job");
+            if (TEST_ENVIRONMENT.systemTestProperties.zosjobs.skipCIM && modifyVersionDefaultUsesCIM) {
+                process.stdout.write("Skipping test because skipCIM is set.");
+            } else {
+                const response = runCliScript(__dirname + "/__scripts__/job/cancel_job.sh", TEST_ENVIRONMENT, [LOCAL_JCL_FILE]);
+                expect(response.stderr.toString()).toBe("");
+                expect(response.status).toBe(0);
+                expect(response.stdout.toString()).toContain("Successfully canceled job");
+                expect(response.stdout.toString()).not.toContain("Failed to cancel job");
+                expect(response.stdout.toString()).not.toContain("Failed to cancel job");
 
-            const jobid = response.stdout.toString().match(jobDataRegex).pop();
-            TEST_ENVIRONMENT.resources.jobs.push(jobid);
+                const jobid = response.stdout.toString().match(jobDataRegex).pop();
+                TEST_ENVIRONMENT.resources.jobs.push(jobid);
+            }
         });
 
         describe("without profiles", () => {
@@ -124,21 +133,25 @@ describe("zos-jobs cancel job command", () => {
             });
 
             it("cancel a job without a profile 1.0", async () => {
-                const response = runCliScript(__dirname + "/__scripts__/job/cancel_job_v1_fully_qualified.sh",
-                    TEST_ENVIRONMENT_NO_PROF,
-                    [
-                        LOCAL_JCL_FILE,
-                        DEFAULT_SYSTEM_PROPS.zosmf.host,
-                        DEFAULT_SYSTEM_PROPS.zosmf.port,
-                        DEFAULT_SYSTEM_PROPS.zosmf.user,
-                        DEFAULT_SYSTEM_PROPS.zosmf.password,
-                    ]);
-                expect(response.stderr.toString()).toBe("");
-                expect(response.status).toBe(0);
-                expect(response.stdout.toString()).toContain("Successfully submitted request to cancel job");
-
-                const jobid = response.stdout.toString().match(jobDataRegexV1).pop();
-                TEST_ENVIRONMENT_NO_PROF.resources.jobs.push(jobid);
+                if (TEST_ENVIRONMENT.systemTestProperties.zosjobs.skipCIM) {
+                    process.stdout.write("Skipping test because skipCIM is set.");
+                } else {
+                    const response = runCliScript(__dirname + "/__scripts__/job/cancel_job_v1_fully_qualified.sh",
+                        TEST_ENVIRONMENT_NO_PROF,
+                        [
+                            LOCAL_JCL_FILE,
+                            DEFAULT_SYSTEM_PROPS.zosmf.host,
+                            DEFAULT_SYSTEM_PROPS.zosmf.port,
+                            DEFAULT_SYSTEM_PROPS.zosmf.user,
+                            DEFAULT_SYSTEM_PROPS.zosmf.password,
+                        ]);
+                    expect(response.stderr.toString()).toBe("");
+                    expect(response.status).toBe(0);
+                    expect(response.stdout.toString()).toContain("Successfully submitted request to cancel job");
+
+                    const jobid = response.stdout.toString().match(jobDataRegexV1).pop();
+                    TEST_ENVIRONMENT_NO_PROF.resources.jobs.push(jobid);
+                }
             });
 
             it("cancel a job without a profile 2.0", async () => {
@@ -160,21 +173,25 @@ describe("zos-jobs cancel job command", () => {
             });
 
             it("cancel a job without a profile default", async () => {
-                const response = runCliScript(__dirname + "/__scripts__/job/cancel_job_fully_qualified.sh",
-                    TEST_ENVIRONMENT_NO_PROF,
-                    [
-                        LOCAL_JCL_FILE,
-                        DEFAULT_SYSTEM_PROPS.zosmf.host,
-                        DEFAULT_SYSTEM_PROPS.zosmf.port,
-                        DEFAULT_SYSTEM_PROPS.zosmf.user,
-                        DEFAULT_SYSTEM_PROPS.zosmf.password,
-                    ]);
-                expect(response.stderr.toString()).toBe("");
-                expect(response.status).toBe(0);
-                expect(response.stdout.toString()).toContain("Successfully canceled job");
-
-                const jobid = response.stdout.toString().match(jobDataRegex).pop();
-                TEST_ENVIRONMENT_NO_PROF.resources.jobs.push(jobid);
+                if (TEST_ENVIRONMENT.systemTestProperties.zosjobs.skipCIM && modifyVersionDefaultUsesCIM) {
+                    process.stdout.write("Skipping test because skipCIM is set.");
+                } else {
+                    const response = runCliScript(__dirname + "/__scripts__/job/cancel_job_fully_qualified.sh",
+                        TEST_ENVIRONMENT_NO_PROF,
+                        [
+                            LOCAL_JCL_FILE,
+                            DEFAULT_SYSTEM_PROPS.zosmf.host,
+                            DEFAULT_SYSTEM_PROPS.zosmf.port,
+                            DEFAULT_SYSTEM_PROPS.zosmf.user,
+                            DEFAULT_SYSTEM_PROPS.zosmf.password,
+                        ]);
+                    expect(response.stderr.toString()).toBe("");
+                    expect(response.status).toBe(0);
+                    expect(response.stdout.toString()).toContain("Successfully canceled job");
+
+                    const jobid = response.stdout.toString().match(jobDataRegex).pop();
+                    TEST_ENVIRONMENT_NO_PROF.resources.jobs.push(jobid);
+                }
             });
         });
     });

diff --git a/packages/cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job.sh b/packages/cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job.sh
@@ -17,7 +17,7 @@ then
 fi
 
 # Loop until the job goes to the output queue
-until [ $ATTEMPTS -gt 0 ]
+until [ $ATTEMPTS -lt 1 ]
 do
     STATUS=`zowe jobs view job-status-by-jobid $JOBID --rff status --rft string`
     RC=$?

diff --git a/...ges/cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job_fully_qualified.sh b/...ges/cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job_fully_qualified.sh
@@ -23,7 +23,7 @@ then
 fi
 
 # Loop until the job goes to the output queue
-until [ $ATTEMPTS -gt 0 ]
+until [ $ATTEMPTS -lt 1 ]
 do
     STATUS=`zowe jobs view job-status-by-jobid $JOBID --host $HOST --port $PORT --user $USER --password $PASS --ru=false --rff status --rft string`
     RC=$?

diff --git a/packages/cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job_v1.sh b/packages/cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job_v1.sh
@@ -17,7 +17,7 @@ then
 fi
 
 # Loop until the job goes to the output queue
-until [ $ATTEMPTS -gt 0 ]
+until [ $ATTEMPTS -lt 1 ]
 do
     STATUS=`zowe jobs view job-status-by-jobid $JOBID --rff status --rft string`
     RC=$?

diff --git a/.../cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job_v1_fully_qualified.sh b/.../cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job_v1_fully_qualified.sh
@@ -23,7 +23,7 @@ then
 fi
 
 # Loop until the job goes to the output queue
-until [ $ATTEMPTS -gt 0 ]
+until [ $ATTEMPTS -lt 1 ]
 do
     STATUS=`zowe jobs view job-status-by-jobid $JOBID --host $HOST --port $PORT --user $USER --password $PASS --ru=false --rff status --rft string`
     RC=$?

diff --git a/packages/cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job_v2.sh b/packages/cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job_v2.sh
@@ -17,7 +17,7 @@ then
 fi
 
 # Loop until the job goes to the output queue
-until [ $ATTEMPTS -gt 0 ]
+until [ $ATTEMPTS -lt 1 ]
 do
     STATUS=`zowe jobs view job-status-by-jobid $JOBID --rff status --rft string`
     RC=$?

diff --git a/.../cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job_v2_fully_qualified.sh b/.../cli/__tests__/zosjobs/__system__/delete/__scripts__/job/delete_job_v2_fully_qualified.sh
@@ -23,7 +23,7 @@ then
 fi
 
 # Loop until the job goes to the output queue
-until [ $ATTEMPTS -gt 0 ]
+until [ $ATTEMPTS -lt 1 ]
 do
     STATUS=`zowe jobs view job-status-by-jobid $JOBID --host $HOST --port $PORT --user $USER --password $PASS --ru=false --rff status --rft string`
     RC=$?

diff --git a/packages/cli/__tests__/zosjobs/__system__/delete/__scripts__/old-jobs/delete_old_jobs.sh b/packages/cli/__tests__/zosjobs/__system__/delete/__scripts__/old-jobs/delete_old_jobs.sh
@@ -18,7 +18,7 @@ then
 fi
 
 # Loop until the job goes to the output queue
-until [ $ATTEMPTS -gt 0 ]
+until [ $ATTEMPTS -lt 1 ]
 do
     STATUS=`zowe jobs view job-status-by-jobid $JOBID --rff status --rft string`
     RC=$?