Skip to content

Commit

Permalink
fix paths for community
Browse files Browse the repository at this point in the history
Issue: AAH-2328
  • Loading branch information
jerabekjiri committed Jun 7, 2023
1 parent 708a286 commit 51219cf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,9 @@ def test_publish_and_auto_approve(ansible_config, artifact, settings):
cv = client(
f"{api_prefix}content/published/v3/collections/"
f"{artifact.namespace}/{artifact.name}/versions/1.0.0/"

)

assert len(cv["signatures"]) >= 1
assert cv["version"] == "1.0.0"


@pytest.mark.community_only
Expand All @@ -166,16 +165,13 @@ def test_auto_approve_muliple(ansible_config, artifact, settings):
cv = client(
f"{api_prefix}content/{published}/v3/collections/"
f"{artifact.namespace}/{artifact.name}/versions/1.0.0/"

)

assert len(cv["signatures"]) >= 1
assert cv["version"] == "1.0.0"

cv = client(
f"{api_prefix}content/published/v3/collections/"
f"{artifact.namespace}/{artifact.name}/versions/1.0.0/"

)

assert len(cv["signatures"]) >= 1
assert cv["name"] == artifact.name
5 changes: 1 addition & 4 deletions galaxy_ng/tests/integration/utils/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,7 @@ def url_safe_join(server, url):
# url contains the base url
if url.startswith(new_url) and server_path in url_path:
return (
new_url
+ server_path.rstrip('/')
+ '/'
+ url_path.replace(server_path, '').lstrip('/')
new_url + url_path
)

# url path is a pulp root
Expand Down

0 comments on commit 51219cf

Please sign in to comment.