Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix System Tests to Handle Running Against APIML #1842

Merged
merged 19 commits into from
Nov 9, 2023
Merged

Fix System Tests to Handle Running Against APIML #1842

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
aeb6db4
Attempt to fix system tests
awharn Nov 1, 2023
e38bd0d
Fix last failing set of tests
awharn Nov 1, 2023
ead2aa5
Restore APIML logic
awharn Nov 2, 2023
f005f15
Add missing z/osmf connection options
awharn Nov 2, 2023
6462bbb
Update snapshots
awharn Nov 2, 2023
6dd0a85
Re-integrate all of the integration tests
awharn Nov 2, 2023
03bb3ff
Remove unnecessary env files
awharn Nov 2, 2023
1bc3960
Revert change in jest-stare storage location
awharn Nov 2, 2023
8547c3a
Group additional tests that depend on same resource
awharn Nov 2, 2023
3ad20df
Resolve final race conditions
awharn Nov 7, 2023
882badd
Always run the daemon because of snapshots
awharn Nov 7, 2023
c36511c
Try to restore all mocks between tests
awharn Nov 7, 2023
5eeb6d7
Try to get more information from the error
awharn Nov 7, 2023
e8d9feb
Try awaiting (Tim's idea)
awharn Nov 8, 2023
6563b4a
Use unique test dir to work around Jest cache
t1m0thyj Nov 8, 2023
e1c1d2c
Revert unnecessary changes
awharn Nov 8, 2023
3b2f714
Trailing newline
awharn Nov 8, 2023
f5cd51f
Update Jest coverage configuration
awharn Nov 9, 2023
add817d
Add subtests to test inclusions
awharn Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions packages/cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to the Zowe CLI package will be documented in this file.

## Recent Changes

- BugFix: Added missing z/OSMF connection options to the z/OS Logs command group.

## `7.18.9`

- Enhancement: Incorporate all source code from the zowe/imperative Github repository into the zowe/zowe-cli repository. This change should have no user impact.
Expand Down
9 changes: 1 addition & 8 deletions packages/cli/__tests__/zosfiles/__system__/compare/ds/Compare.ds.system.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,7 @@ describe("Compare Data Sets", () => {
});
defaultSystem = testEnvironment.systemTestProperties;

REAL_SESSION = new Session({
user: defaultSystem.zosmf.user,
password: defaultSystem.zosmf.password,
hostname: defaultSystem.zosmf.host,
port: defaultSystem.zosmf.port,
type: "basic",
rejectUnauthorized: defaultSystem.zosmf.rejectUnauthorized
});
REAL_SESSION = TestEnvironment.createZosmfSession(testEnvironment);

dsname = getUniqueDatasetName(defaultSystem.zosmf.user);
});
Expand Down
9 changes: 1 addition & 8 deletions packages/cli/__tests__/zosfiles/__system__/view/ds/View.ds.system.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,7 @@ describe("View Data Set", () => {
});
defaultSystem = testEnvironment.systemTestProperties;

REAL_SESSION = new Session({
user: defaultSystem.zosmf.user,
password: defaultSystem.zosmf.password,
hostname: defaultSystem.zosmf.host,
port: defaultSystem.zosmf.port,
type: "basic",
rejectUnauthorized: defaultSystem.zosmf.rejectUnauthorized
});
REAL_SESSION = TestEnvironment.createZosmfSession(testEnvironment);

dsname = getUniqueDatasetName(defaultSystem.zosmf.user);
});
Expand Down
9 changes: 1 addition & 8 deletions packages/cli/__tests__/zosfiles/__system__/view/uss/View.uss.system.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,7 @@ describe("View uss file", () => {
});
defaultSystem = testEnvironment.systemTestProperties;

REAL_SESSION = new Session({
user: defaultSystem.zosmf.user,
password: defaultSystem.zosmf.password,
hostname: defaultSystem.zosmf.host,
port: defaultSystem.zosmf.port,
type: "basic",
rejectUnauthorized: defaultSystem.zosmf.rejectUnauthorized
});
REAL_SESSION = TestEnvironment.createZosmfSession(testEnvironment);

dsname = getUniqueDatasetName(defaultSystem.zosmf.user);
// using unique DS function to generate unique USS file name
Expand Down
3 changes: 0 additions & 3 deletions packages/cli/__tests__/zoslogs/__system__/list/cli.zos-logs.list.logs.system.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ import * as fs from "fs";
// Test Environment populated in the beforeAll();
let TEST_ENVIRONMENT: ITestEnvironment<ITestPropertiesSchema>;

// Expected length constants
const FOLLOW_UP_ATTEMPTS: number = 3;

describe("zos-logs list logs", () => {
// Create the unique test environment with zosmf profiles
beforeAll(async () => {
Expand Down
13 changes: 12 additions & 1 deletion packages/cli/src/zoslogs/ZosLogs.definition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

import { ICommandDefinition } from "@zowe/imperative";
import { ZosmfSession } from "@zowe/zosmf-for-zowe-sdk";
import { ListDefinition } from "./list/List.definition";

export const definition: ICommandDefinition = {
Expand All @@ -18,7 +19,17 @@ export const definition: ICommandDefinition = {
type: "group",
summary: "Interact with z/OS logs",
description: "Interact with z/OS logs.",
children: [ListDefinition]
children: [ListDefinition],
passOn: [
{
property: "options",
value: ZosmfSession.ZOSMF_CONNECTION_OPTIONS,
merge: true,
ignoreNodes: [
{type: "group"}
]
}
]
};

module.exports = definition;
18 changes: 2 additions & 16 deletions packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,7 @@ describe("CancelJobs System tests", () => {
});
systemProps = testEnvironment.systemTestProperties;

REAL_SESSION = new Session({
user: systemProps.zosmf.user,
password: systemProps.zosmf.password,
hostname: systemProps.zosmf.host,
port: systemProps.zosmf.port,
type: "basic",
rejectUnauthorized: systemProps.zosmf.rejectUnauthorized
});
REAL_SESSION = TestEnvironment.createZosmfSession(testEnvironment);

const ACCOUNT = systemProps.tso.account;
const maxStepNum = 6; // Use lots of steps to make the job stay in INPUT status longer
Expand Down Expand Up @@ -187,14 +180,7 @@ describe("CancelJobs System tests - encoded", () => {
});
systemProps = testEnvironment.systemTestProperties;

REAL_SESSION = new Session({
user: systemProps.zosmf.user,
password: systemProps.zosmf.password,
hostname: systemProps.zosmf.host,
port: systemProps.zosmf.port,
type: "basic",
rejectUnauthorized: systemProps.zosmf.rejectUnauthorized
});
REAL_SESSION = TestEnvironment.createZosmfSession(testEnvironment);

const ACCOUNT = systemProps.tso.account;
const maxStepNum = 6; // Use lots of steps to make the job stay in INPUT status longer
Expand Down
2 changes: 1 addition & 1 deletion packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ 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;
});
Expand Down
1 change: 1 addition & 0 deletions packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ describe("Get Jobs - System Tests", () => {
password: "fake",
hostname: defaultSystem.zosmf.host,
port: defaultSystem.zosmf.port,
basePath: defaultSystem.zosmf.basePath,
type: "basic",
rejectUnauthorized: false
});
Expand Down
Loading