Skip to content

Commit

Permalink
fix(tests): pins oscal-content references in tests the latest 1.0 com…
Browse files Browse the repository at this point in the history
…mit (#1474)

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
  • Loading branch information
jpower432 committed Nov 14, 2023
1 parent 6cf498b commit 0dc7551
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tests/data/json/full_profile_rev5.json
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
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
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

0 comments on commit 0dc7551

Please sign in to comment.