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(tests): pins oscal-content references in tests the latest 1.0 commit #1474

Merged
merged 1 commit into from
Nov 14, 2023
Merged

fix(tests): pins oscal-content references in tests the latest 1.0 commit #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tests/data/json/full_profile_rev5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5823,7 +5823,7 @@
],
"rlinks": [
{
"href": "https://raw.githubusercontent.com/usnistgov/oscal-content/main/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_catalog.json",
"href": "https://raw.githubusercontent.com/usnistgov/oscal-content/690f517daaf3a6cbb4056d3cde6eae2756765620/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_catalog.json",
"media-type": "application/json"
}
]
Expand Down
2 changes: 1 addition & 1 deletion tests/trestle/core/commands/import__test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ def test_import_from_url(tmp_trestle_dir: pathlib.Path) -> None:

def test_import_from_nist(tmp_trestle_dir: pathlib.Path) -> None:
"""Test import via url from nist."""
uri = 'https://raw.githubusercontent.com/usnistgov/oscal-content/master/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_HIGH-baseline_profile-min.json' # noqa: E501
uri = 'https://raw.githubusercontent.com/usnistgov/oscal-content/690f517daaf3a6cbb4056d3cde6eae2756765620/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_HIGH-baseline_profile-min.json' # noqa: E501
args = argparse.Namespace(trestle_root=tmp_trestle_dir, file=uri, output='my_catalog', verbose=1, regenerate=False)
i = importcmd.ImportCmd()
assert i._run(args) == 0
Expand Down
2 changes: 1 addition & 1 deletion tests/trestle/core/profile_resolver_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,6 @@ def test_profile_resolver_no_params(tmp_trestle_dir: pathlib.Path) -> None:

def test_remote_profile_relative_cat(tmp_trestle_dir: pathlib.Path) -> None:
"""Test profile resolver with remote profile and import of relative catalog path."""
profile_path = 'https://raw.githubusercontent.com/usnistgov/oscal-content/main/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_LOW-baseline_profile.json' # noqa E501
profile_path = 'https://raw.githubusercontent.com/usnistgov/oscal-content/690f517daaf3a6cbb4056d3cde6eae2756765620/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_LOW-baseline_profile.json' # noqa E501
resolved_cat = ProfileResolver.get_resolved_profile_catalog(tmp_trestle_dir, profile_path)
assert len(resolved_cat.groups) > 10
Loading