From 9d32ad8654f02d694a1d732b5180fafd51dc2128 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Thu, 9 May 2024 16:40:54 -0400 Subject: [PATCH] Make some changes Signed-off-by: Andrew W. Harn --- .gitignore | 3 ++- jest.config.js | 9 +++++++++ .../__tests__/__system__/DownloadJobs.system.test.ts | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c056f35af1..53b8187595 100644 --- a/.gitignore +++ b/.gitignore @@ -120,4 +120,5 @@ target/ packages/imperative/web-help/dist/css/bundle* packages/imperative/web-help/dist/js/ -jest-stare/ \ No newline at end of file +jest-stare/ +jest.user.config.js \ No newline at end of file diff --git a/jest.config.js b/jest.config.js index cd74c44fab..c3077263a8 100644 --- a/jest.config.js +++ b/jest.config.js @@ -120,6 +120,14 @@ const projectConfig = { ] } +let userConfig = () => { + try { + return require("./jest.user.config"); + } catch (err) { + return {}; + } +}; + module.exports = { ...sharedConfig, ...projectConfig, @@ -153,4 +161,5 @@ module.exports = { // You may need to specify maxWorkers if you run out of RAM // GHA should use 75% due to high ram, low core count, end user systems ~67% "maxWorkers": process.env.GITHUB_ACTIONS != null ? "75%" : "67%", + ...userConfig() } diff --git a/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts index 97ba3f71cd..a2e150aee0 100644 --- a/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts @@ -105,12 +105,12 @@ describe("Download Jobs - System tests", () => { ACCOUNT = defaultSystem.tso.account; const JOB_LENGTH = 6; - DOWNLOAD_JOB_NAME = REAL_SESSION.ISession.user.substr(0, JOB_LENGTH).toUpperCase() + "DJ"; + DOWNLOAD_JOB_NAME = REAL_SESSION.ISession.user?.substr(0, JOB_LENGTH).toUpperCase() + "DJ"; JOBCLASS = testEnvironment.systemTestProperties.zosjobs.jobclass; SYSAFF = testEnvironment.systemTestProperties.zosjobs.sysaff; }); - fit("should be able to download single DD from job output with encoding", async () => { + it.only("should be able to download single DD from job output with encoding", async () => { const downloadDir = outputDirectory + "/downloadsingle/"; await DownloadJobs.downloadSpoolContentCommon(REAL_SESSION, { outDir: downloadDir,