From 100db64caea632798b9f7a60b4d21fdc5d5b8ec6 Mon Sep 17 00:00:00 2001 From: Jennifer Power Date: Thu, 9 Nov 2023 09:47:41 -0500 Subject: [PATCH] fix(tests): pins oscal-content references in tests the latest 1.0 commit Signed-off-by: Jennifer Power --- tests/data/json/full_profile_rev5.json | 2 +- tests/trestle/core/commands/import__test.py | 2 +- tests/trestle/core/profile_resolver_test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/data/json/full_profile_rev5.json b/tests/data/json/full_profile_rev5.json index a5c678552..233ece5f7 100644 --- a/tests/data/json/full_profile_rev5.json +++ b/tests/data/json/full_profile_rev5.json @@ -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" } ] diff --git a/tests/trestle/core/commands/import__test.py b/tests/trestle/core/commands/import__test.py index 4ba21fa19..06a454ab3 100644 --- a/tests/trestle/core/commands/import__test.py +++ b/tests/trestle/core/commands/import__test.py @@ -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 diff --git a/tests/trestle/core/profile_resolver_test.py b/tests/trestle/core/profile_resolver_test.py index d7eba4d77..b82961c49 100644 --- a/tests/trestle/core/profile_resolver_test.py +++ b/tests/trestle/core/profile_resolver_test.py @@ -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