Skip to content

Commit a477781

Browse files
committed
DO NOT MERGE: Unmerged integration test data
Signed-off-by: Taylor Madore <tmadore@redhat.com>
1 parent 06b65b3 commit a477781

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

tests/integration/test_data/pip_custom_index/bom.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
}
88
},
99
"subjects": [
10-
"pkg:pypi/integration-tests?vcs_url=git%2Bhttps://github.com/hermetoproject/integration-tests.git%4055376bc13904c2f450aac6ee89969d539c8d9f05",
11-
"pkg:pypi/requests@2.32.3?repository_url=http://127.0.0.1:8080/simple/"
10+
"pkg:pypi/integration-tests?vcs_url=git%2Bhttps://github.com/taylormadore/integration-tests%40aea3dd67e641eb4e7bf12fa701e00aad5fd683cd",
11+
"pkg:pypi/requests@2.32.3?repository_url=https://127.0.0.1:8443/repository/pypi-proxy/simple"
1212
],
1313
"text": "hermeto:backend:pip",
1414
"timestamp": "2025-01-01T00:00:00Z"
@@ -17,19 +17,19 @@
1717
"bomFormat": "CycloneDX",
1818
"components": [
1919
{
20-
"bom-ref": "pkg:pypi/integration-tests?vcs_url=git%2Bhttps://github.com/hermetoproject/integration-tests.git%4055376bc13904c2f450aac6ee89969d539c8d9f05",
20+
"bom-ref": "pkg:pypi/integration-tests?vcs_url=git%2Bhttps://github.com/taylormadore/integration-tests%40aea3dd67e641eb4e7bf12fa701e00aad5fd683cd",
2121
"name": "integration-tests",
2222
"properties": [
2323
{
2424
"name": "hermeto:found_by",
2525
"value": "hermeto"
2626
}
2727
],
28-
"purl": "pkg:pypi/integration-tests?vcs_url=git%2Bhttps://github.com/hermetoproject/integration-tests.git%4055376bc13904c2f450aac6ee89969d539c8d9f05",
28+
"purl": "pkg:pypi/integration-tests?vcs_url=git%2Bhttps://github.com/taylormadore/integration-tests%40aea3dd67e641eb4e7bf12fa701e00aad5fd683cd",
2929
"type": "library"
3030
},
3131
{
32-
"bom-ref": "pkg:pypi/requests@2.32.3?repository_url=http://127.0.0.1:8080/simple/",
32+
"bom-ref": "pkg:pypi/requests@2.32.3?repository_url=https://127.0.0.1:8443/repository/pypi-proxy/simple",
3333
"name": "requests",
3434
"properties": [
3535
{
@@ -41,7 +41,7 @@
4141
"value": "true"
4242
}
4343
],
44-
"purl": "pkg:pypi/requests@2.32.3?repository_url=http://127.0.0.1:8080/simple/",
44+
"purl": "pkg:pypi/requests@2.32.3?repository_url=https://127.0.0.1:8443/repository/pypi-proxy/simple",
4545
"type": "library",
4646
"version": "2.32.3"
4747
}

tests/integration/test_pip.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,12 @@
113113
),
114114
pytest.param(
115115
utils.TestParameters(
116-
branch="pip/custom-index",
116+
branch="nginx-pip-custom-index",
117117
packages=({"path": ".", "type": "pip", "binary": {}},),
118118
expected_exit_code=0,
119119
expected_output="All dependencies fetched successfully",
120120
netrc_content="machine 127.0.0.1 login hermeto-user password hermeto-pass",
121+
repo_url="https://github.com/taylormadore/integration-tests",
121122
),
122123
id="pip_custom_index",
123124
marks=pytest.mark.skipif(

tests/integration/test_rpm.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
),
8282
pytest.param(
8383
utils.TestParameters(
84-
branch="rpm/dnf-tls-client-auth",
84+
branch="nginx-rpm-dnf-tls-client-auth",
8585
packages=(
8686
{
8787
"path": ".",
@@ -99,6 +99,7 @@
9999
check_output=True,
100100
check_deps_checksums=False,
101101
expected_exit_code=0,
102+
repo_url="https://github.com/taylormadore/integration-tests",
102103
),
103104
id="rpm_dnf_tls_client_auth",
104105
marks=pytest.mark.skipif(

0 commit comments

Comments
 (0)