Merge pull request #199 from pcoop/branch1

ChrisPark89 · web-flow · commit 53140ad45695 · 2019-05-30T14:36:01.000+01:00
jOBid consistency
diff --git a/__tests__/api/BundleDeploy/BundleDeployer.test.ts b/__tests__/api/BundleDeploy/BundleDeployer.test.ts
@@ -124,7 +124,7 @@ describe("BundleDeployer01", () => {
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementationOnce((session: any, jcl: string, parms: any) => {
                 parms.task.statusMessage = "Waiting for JOB12345 to enter OUTPUT";
                 parms.task.stageName = TaskStage.IN_PROGRESS;
-                const expectedMsg = "Running DFHDPLOY (DEPLOY), job JOB12345";
+                const expectedMsg = "Running DFHDPLOY (DEPLOY), jobid JOB12345";
                 // wait 1.5 seconds
                 return new Promise((resolve, reject) => {
                   setTimeout(() => {
diff --git a/__tests__/api/BundleDeploy/__snapshots__/BundleDeployer.test.ts.snap b/__tests__/api/BundleDeploy/__snapshots__/BundleDeployer.test.ts.snap
@@ -2,9 +2,9 @@
 
 exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 1`] = `"DFHRL2055I"`;
 
-exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 2`] = `"DFHDPLOY stopped processing for JOBID UNKNOWN due to an error."`;
+exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 2`] = `"DFHDPLOY stopped processing for jobid UNKNOWN due to an error."`;
 
-exports[`BundleDeployer01 should complain if SYSTSPRT not found 1`] = `"SYSTSPRT and JESMSGLG output from DFHDPLOY not found for JOBID UNKNOWN. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
+exports[`BundleDeployer01 should complain if SYSTSPRT not found 1`] = `"SYSTSPRT and JESMSGLG output from DFHDPLOY not found for jobid UNKNOWN. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
 
 exports[`BundleDeployer01 should complain if cicshlq not found 1`] = `"Validation of --cicshlq dataset failed: Injected CICSHLQ error"`;
 
@@ -16,7 +16,7 @@ exports[`BundleDeployer01 should complain if cpsmhlq not found2 1`] = `"EYU9ABSI
 
 exports[`BundleDeployer01 should complain if status can't be determined 1`] = `" "`;
 
-exports[`BundleDeployer01 should complain if status can't be determined 2`] = `"DFHDPLOY command completed for JOBID UNKNOWN, but status cannot be determined."`;
+exports[`BundleDeployer01 should complain if status can't be determined 2`] = `"DFHDPLOY command completed for jobid UNKNOWN, but status cannot be determined."`;
 
 exports[`BundleDeployer01 should complain with missing zOSMF profile for deploy 1`] = `"Injected Create error"`;
 
@@ -32,7 +32,7 @@ exports[`BundleDeployer01 should fail with overlong jobcard 1`] = `"--jobcard pa
 
 exports[`BundleDeployer01 should failover to JESMSGLG if SYSTSPRT not found 1`] = `"undefined"`;
 
-exports[`BundleDeployer01 should failover to JESMSGLG if SYSTSPRT not found 2`] = `"DFHDPLOY command completed in error for JOBID UNKNOWN without generating SYSTSPRT output."`;
+exports[`BundleDeployer01 should failover to JESMSGLG if SYSTSPRT not found 2`] = `"DFHDPLOY command completed in error for jobid UNKNOWN without generating SYSTSPRT output."`;
 
 exports[`BundleDeployer01 should generate deploy JCL for AVAILABLE 1`] = `
 "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
@@ -369,9 +369,9 @@ UNDEPLOY BUNDLE(12345678)
 "
 `;
 
-exports[`BundleDeployer01 should handle failure during submitjobs processing 1`] = `"Failure occurred submitting DFHDPLOY JCL for JOBID UNKNOWN: 'Injected Submit error'. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
+exports[`BundleDeployer01 should handle failure during submitjobs processing 1`] = `"Failure occurred submitting DFHDPLOY JCL for jobid UNKNOWN: 'Injected Submit error'. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
 
-exports[`BundleDeployer01 should include the JOBID in an error 1`] = `"Failure occurred submitting DFHDPLOY JCL for JOBID JOB12345: 'Injected submit error'. Most recent status update: 'Running DFHDPLOY (DEPLOY), job JOB12345'."`;
+exports[`BundleDeployer01 should include the JOBID in an error 1`] = `"Failure occurred submitting DFHDPLOY JCL for jobid JOB12345: 'Injected submit error'. Most recent status update: 'Running DFHDPLOY (DEPLOY), jobid JOB12345'."`;
 
 exports[`BundleDeployer01 should support long bundledir 1`] = `
 "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
@@ -594,7 +594,7 @@ DEPLOY BUNDLE(12345678)
 "
 `;
 
-exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 1`] = `"DFHDPLOY did not generate any output for JOBID UNKNOWN. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
+exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 1`] = `"DFHDPLOY did not generate any output for jobid UNKNOWN. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
 
 exports[`BundleDeployer01 should undeploy successfully 1`] = `"Bundle undeployment successful."`;
 
diff --git a/__tests__/api/BundlePush/BundlePusher.test.ts b/__tests__/api/BundlePush/BundlePusher.test.ts
@@ -819,7 +819,7 @@ describe("BundlePusher01", () => {
         submitSpy.mockImplementationOnce(() => { throw new Error("Injected deploy error"); });
 
         await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
-              "Failure occurred submitting DFHDPLOY JCL for JOBID UNKNOWN: 'Injected deploy error'. " +
+              "Failure occurred submitting DFHDPLOY JCL for jobid UNKNOWN: 'Injected deploy error'. " +
               "Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'.");
 
         expect(zosMFSpy).toHaveBeenCalledTimes(1);
@@ -1133,7 +1133,7 @@ describe("BundlePusher01", () => {
         parms.arguments.verbose = true;
 
         await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
-              "DFHDPLOY stopped processing for JOBID UNKNOWN due to an error.", parms);
+              "DFHDPLOY stopped processing for jobid UNKNOWN due to an error.", parms);
 
         expect(consoleText).toContain("Making remote bundle directory '/u/ThisDoesNotExist/12345678'");
         expect(consoleText).toContain("Accessing contents of remote bundle directory");
diff --git a/src/api/BundleDeploy/BundleDeployer.ts b/src/api/BundleDeploy/BundleDeployer.ts
@@ -276,7 +276,7 @@ export class BundleDeployer {
       if (statusWords.length >= 2) {
         if (statusWords[2] !== undefined && statusWords[2].indexOf("JOB") === 0) {
            this.jobId = statusWords[2];
-           this.progressBar.statusMessage = "Running DFHDPLOY (" + action + "), job " + this.jobId;
+           this.progressBar.statusMessage = "Running DFHDPLOY (" + action + "), jobid " + this.jobId;
 
            this.endProgressBar();
            // log the jobid for posterity
@@ -323,7 +323,7 @@ export class BundleDeployer {
     }
     catch (error) {
       this.progressBar.stageName = TaskStage.FAILED;
-      throw new Error("Failure occurred submitting DFHDPLOY JCL for JOBID " + this.jobId + ": '" + error.message +
+      throw new Error("Failure occurred submitting DFHDPLOY JCL for jobid " + this.jobId + ": '" + error.message +
                       "'. Most recent status update: '" + this.progressBar.statusMessage + "'.");
     }
 
@@ -334,7 +334,7 @@ export class BundleDeployer {
 
         if (file.data === undefined || file.data.length === 0) {
           this.progressBar.stageName = TaskStage.FAILED;
-          throw new Error("DFHDPLOY did not generate any output for JOBID " + this.jobId +
+          throw new Error("DFHDPLOY did not generate any output for jobid " + this.jobId +
             ". Most recent status update: '" + this.progressBar.statusMessage + "'.");
         }
 
@@ -354,7 +354,7 @@ export class BundleDeployer {
           this.progressBar.stageName = TaskStage.FAILED;
           // log the error output to the console
           this.params.response.console.log(file.data);
-          throw new Error("DFHDPLOY stopped processing for JOBID " + this.jobId + " due to an error.");
+          throw new Error("DFHDPLOY stopped processing for jobid " + this.jobId + " due to an error.");
         }
         if (file.data.indexOf("DFHRL2043I") > -1) {
           this.progressBar.stageName = TaskStage.COMPLETE;
@@ -382,7 +382,7 @@ export class BundleDeployer {
         this.progressBar.stageName = TaskStage.FAILED;
         // log the error output to the console
         this.params.response.console.log(file.data);
-        throw new Error("DFHDPLOY command completed for JOBID " + this.jobId + ", but status cannot be determined.");
+        throw new Error("DFHDPLOY command completed for jobid " + this.jobId + ", but status cannot be determined.");
       }
     }
 
@@ -392,12 +392,12 @@ export class BundleDeployer {
         this.progressBar.stageName = TaskStage.FAILED;
         // log the error output to the console
         this.params.response.console.log(file.data);
-        throw new Error("DFHDPLOY command completed in error for JOBID " + this.jobId + " without generating SYSTSPRT output.");
+        throw new Error("DFHDPLOY command completed in error for jobid " + this.jobId + " without generating SYSTSPRT output.");
       }
     }
 
     this.progressBar.stageName = TaskStage.FAILED;
-    throw new Error("SYSTSPRT and JESMSGLG output from DFHDPLOY not found for JOBID " + this.jobId +
+    throw new Error("SYSTSPRT and JESMSGLG output from DFHDPLOY not found for jobid " + this.jobId +
                     ". Most recent status update: '" + this.progressBar.statusMessage + "'.");
   }
 

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ export class BundleDeployer {`
`276`	`276`	`if (statusWords.length >= 2) {`
`277`	`277`	`if (statusWords[2] !== undefined && statusWords[2].indexOf("JOB") === 0) {`
`278`	`278`	`this.jobId = statusWords[2];`
`279`		`- this.progressBar.statusMessage = "Running DFHDPLOY (" + action + "), job " + this.jobId;`
	`279`	`+ this.progressBar.statusMessage = "Running DFHDPLOY (" + action + "), jobid " + this.jobId;`
`280`	`280`
`281`	`281`	`this.endProgressBar();`
`282`	`282`	`// log the jobid for posterity`
`@@ -323,7 +323,7 @@ export class BundleDeployer {`
`323`	`323`	`}`
`324`	`324`	`catch (error) {`
`325`	`325`	`this.progressBar.stageName = TaskStage.FAILED;`
`326`		`- throw new Error("Failure occurred submitting DFHDPLOY JCL for JOBID " + this.jobId + ": '" + error.message +`
	`326`	`+ throw new Error("Failure occurred submitting DFHDPLOY JCL for jobid " + this.jobId + ": '" + error.message +`
`327`	`327`	`"'. Most recent status update: '" + this.progressBar.statusMessage + "'.");`
`328`	`328`	`}`
`329`	`329`
`@@ -334,7 +334,7 @@ export class BundleDeployer {`
`334`	`334`
`335`	`335`	`if (file.data === undefined \|\| file.data.length === 0) {`
`336`	`336`	`this.progressBar.stageName = TaskStage.FAILED;`
`337`		`- throw new Error("DFHDPLOY did not generate any output for JOBID " + this.jobId +`
	`337`	`+ throw new Error("DFHDPLOY did not generate any output for jobid " + this.jobId +`
`338`	`338`	`". Most recent status update: '" + this.progressBar.statusMessage + "'.");`
`339`	`339`	`}`
`340`	`340`
`@@ -354,7 +354,7 @@ export class BundleDeployer {`
`354`	`354`	`this.progressBar.stageName = TaskStage.FAILED;`
`355`	`355`	`// log the error output to the console`
`356`	`356`	`this.params.response.console.log(file.data);`
`357`		`- throw new Error("DFHDPLOY stopped processing for JOBID " + this.jobId + " due to an error.");`
	`357`	`+ throw new Error("DFHDPLOY stopped processing for jobid " + this.jobId + " due to an error.");`
`358`	`358`	`}`
`359`	`359`	`if (file.data.indexOf("DFHRL2043I") > -1) {`
`360`	`360`	`this.progressBar.stageName = TaskStage.COMPLETE;`
`@@ -382,7 +382,7 @@ export class BundleDeployer {`
`382`	`382`	`this.progressBar.stageName = TaskStage.FAILED;`
`383`	`383`	`// log the error output to the console`
`384`	`384`	`this.params.response.console.log(file.data);`
`385`		`- throw new Error("DFHDPLOY command completed for JOBID " + this.jobId + ", but status cannot be determined.");`
	`385`	`+ throw new Error("DFHDPLOY command completed for jobid " + this.jobId + ", but status cannot be determined.");`
`386`	`386`	`}`
`387`	`387`	`}`
`388`	`388`
`@@ -392,12 +392,12 @@ export class BundleDeployer {`
`392`	`392`	`this.progressBar.stageName = TaskStage.FAILED;`
`393`	`393`	`// log the error output to the console`
`394`	`394`	`this.params.response.console.log(file.data);`
`395`		`- throw new Error("DFHDPLOY command completed in error for JOBID " + this.jobId + " without generating SYSTSPRT output.");`
	`395`	`+ throw new Error("DFHDPLOY command completed in error for jobid " + this.jobId + " without generating SYSTSPRT output.");`
`396`	`396`	`}`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`this.progressBar.stageName = TaskStage.FAILED;`
`400`		`- throw new Error("SYSTSPRT and JESMSGLG output from DFHDPLOY not found for JOBID " + this.jobId +`
	`400`	`+ throw new Error("SYSTSPRT and JESMSGLG output from DFHDPLOY not found for jobid " + this.jobId +`
`401`	`401`	`". Most recent status update: '" + this.progressBar.statusMessage + "'.");`
`402`	`402`	`}`
`403`	`403`