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

integration tests minor improvements #783

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

integration tests minor improvements #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a73cf2e
yarn classic: Allow to skip integration tests
slimreaper35 Jan 9, 2025
73408fd
nox: Fix generate test data command
slimreaper35 Jan 9, 2025
71d9080
Update test data for generic fetcher
slimreaper35 Jan 9, 2025
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 noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ def generate_test_data(session: Session) -> None:
_run_integration_tests(
session,
{
"CACHI2_RUN_ALL_INTEGRATION_TESTS": "true",
"CACHI2_GENERATE_TEST_DATA": "true",
"PYTEST_ADDOPTS": "-k test_e2e",
},
)

Expand Down
36 changes: 18 additions & 18 deletions tests/integration/test_data/generic_maven_e2e/bom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,50 @@
"bomFormat": "CycloneDX",
"components": [
{
"externalReferences": [
{
"type": "distribution",
"url": "https://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.10.14/ant-launcher-1.10.14.jar"
}
],
"name": "ant-launcher",
"purl": "pkg:maven/org.apache.ant/[email protected]?checksum=sha256:f0909725a7a24e393888f3fbb558347abf506ce2f7ebc581ff26331b94d951a5&repository_url=https://repo1.maven.org/maven2&type=jar",
"version": "1.10.14",
"properties": [
{
"name": "cachi2:found_by",
"value": "cachi2"
}
],
"purl": "pkg:maven/org.apache.ant/[email protected]?checksum=sha256:f0909725a7a24e393888f3fbb558347abf506ce2f7ebc581ff26331b94d951a5&repository_url=https://repo1.maven.org/maven2&type=jar",
"type": "library",
"version": "1.10.14"
},
{
"externalReferences": [
{
"url": "https://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.10.14/ant-launcher-1.10.14.jar",
"type": "distribution"
"type": "distribution",
"url": "https://repo1.maven.org/maven2/org/apache/ant/ant/1.10.14/ant-1.10.14.jar"
}
]
},
{
],
"name": "ant",
"purl": "pkg:maven/org.apache.ant/[email protected]?checksum=sha256:4cbbd9243de4c1042d61d9a15db4c43c90ff93b16d78b39481da1c956c8e9671&repository_url=https://repo1.maven.org/maven2&type=jar",
"version": "1.10.14",
"properties": [
{
"name": "cachi2:found_by",
"value": "cachi2"
}
],
"purl": "pkg:maven/org.apache.ant/[email protected]?checksum=sha256:4cbbd9243de4c1042d61d9a15db4c43c90ff93b16d78b39481da1c956c8e9671&repository_url=https://repo1.maven.org/maven2&type=jar",
"type": "library",
"externalReferences": [
{
"url": "https://repo1.maven.org/maven2/org/apache/ant/ant/1.10.14/ant-1.10.14.jar",
"type": "distribution"
}
]
"version": "1.10.14"
}
],
"metadata": {
"tools": [
{
"vendor": "red hat",
"name": "cachi2"
"name": "cachi2",
"vendor": "red hat"
}
]
},
"specVersion": "1.4",
"version": 1
}
}
4 changes: 2 additions & 2 deletions tests/integration/test_data/generic_maven_e2e/fetch_deps_sha256sums.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"generic/ant.jar": "sha256:4cbbd9243de4c1042d61d9a15db4c43c90ff93b16d78b39481da1c956c8e9671",
"generic/ant-launcher.jar": "sha256:f0909725a7a24e393888f3fbb558347abf506ce2f7ebc581ff26331b94d951a5"
"generic/ant-launcher.jar": "sha256:f0909725a7a24e393888f3fbb558347abf506ce2f7ebc581ff26331b94d951a5",
"generic/ant.jar": "sha256:4cbbd9243de4c1042d61d9a15db4c43c90ff93b16d78b39481da1c956c8e9671"
}
5 changes: 4 additions & 1 deletion tests/integration/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@
Path("pyproject.toml"),
)
)

# package managers that are not exposed to the user but are used internally
EXTRA_PMS = ["yarn_classic"]
SUPPORTED_PMS: frozenset[str] = frozenset(
list(resolver._package_managers) + list(resolver._dev_package_managers)
list(resolver._package_managers) + list(resolver._dev_package_managers) + EXTRA_PMS
)


Expand Down
Loading