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

Dynamically generate invalid config files in unit tests #220

Merged
merged 12 commits into from
Dec 1, 2023
Merged

Dynamically generate invalid config files in unit tests #220

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0e3b5c4
Dynamically generate invalid config files in unit tests
aadityasinha-dotcom Oct 10, 2023
0f2eda8
Merge branch 'main' into validate_schema
aadityasinha-dotcom Oct 10, 2023
81b422e
Merge branch 'main' into validate_schema
aadityasinha-dotcom Oct 22, 2023
66ceb94
chanhes to the tests
aadityasinha-dotcom Oct 25, 2023
22a036f
removed invalidUri file
aadityasinha-dotcom Nov 10, 2023
7204220
created the schema file dynamically as well
aadityasinha-dotcom Nov 22, 2023
3e39549
Merge branch 'main' into validate_schema
aadityasinha-dotcom Nov 22, 2023
8b14be9
few changes accidentaly run the code which writes the file
aadityasinha-dotcom Nov 22, 2023
ae8f4d6
Merge branch 'validate_schema' of https://github.com/aadityasinha-dot…
aadityasinha-dotcom Nov 22, 2023
faca77e
Merge branch 'main' into validate_schema
aadityasinha-dotcom Nov 28, 2023
c00a410
Merge branch 'main' into validate_schema
aadityasinha-dotcom Nov 29, 2023
f24a87e
Merge branch 'main' into validate_schema
t1m0thyj Dec 1, 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
3 changes: 2 additions & 1 deletion src/core/zowe/core_for_zowe_sdk/config_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ def validate_schema(self) -> None:

# validate the $schema property
if path_schema_json:
validate_config_json(self.jsonc, path_schema_json, cwd=self.location)
print(self.jsonc, path_schema_json)
validate_config_json(self.jsonc, path_schema_json, cwd = self.location)

def schema_list(
self,
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/fixtures/invalid.zowe.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@
"description": "The z/OSMF server host name."
},
"port": {
"type": "number",
"type": "string",
"description": "The z/OSMF server port.",
"default": 443
"default": "443"
},
"user": {
"type": "string",
Expand Down
9 changes: 7 additions & 2 deletions tests/unit/test_zowe_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,9 +610,14 @@ def test_profile_loading_with_invalid_schema(self, get_pass_func):
# Setup - copy profile to fake filesystem created by pyfakefs
with self.assertRaises(ValidationError):
custom_file_path = os.path.join(self.custom_dir, "invalid.zowe.config.json")
shutil.copy(self.original_invalid_file_path, custom_file_path)
aadityasinha-dotcom marked this conversation as resolved.
Show resolved Hide resolved
shutil.copy(self.original_invalid_schema_file_path, self.custom_dir)
# shutil.copy(self.original_invalid_file_path, custom_file_path)
# shutil.copy(self.original_invalid_schema_file_path, self.custom_dir)
os.chdir(self.custom_dir)
with open(self.original_file_path, 'r') as f:
original_config = commentjson.load(f)
original_config["$schema"] = "./invalid.zowe.schema.json"
with open(os.path.join(self.custom_dir, "invalid.zowe.config.json"), 'w') as f:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remove the files like invalid.zowe.config.json or invalidUri.zowe.config.json because other tests were failing

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other tests are probably failing because the setUp stage still expects the "invalid" files to exist:

zowe-client-python-sdk/tests/unit/test_zowe_core.py

Lines 201 to 204 in 66ceb94

self.fs.add_real_file(self.original_invalid_file_path)
self.fs.add_real_file(self.original_invalid_schema_file_path)
self.fs.add_real_file(self.original_invalidUri_file_path)
self.fs.add_real_file(self.original_invalidUri_schema_file_path)

I think this can be fixed by moving the add_real_file calls for invalid.zowe.config.json inside the specific tests where the files are created.

commentjson.dump(original_config, f)

self.setUpCreds(
custom_file_path,
Expand Down
Loading