Skip to content

Draft: Return error msgs from ensure_simple correctly #1056

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

Draft
jobselko wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Draft: Return error msgs from ensure_simple correctly #1056

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions pulp_python/tests/functional/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def ensure_simple(simple_url, packages, sha_digests=None, metadata_sha_digests=N
how would one know that it's there?*
"""

def explore_links(page_url, page_name, links_found, msgs):
def explore_links(page_url, page_name, links_found):
msgs = ""
legit_found_links = []
page = html.fromstring(requests.get(page_url).text)
page_links = page.xpath("/html/body/a")
Expand All @@ -56,15 +57,18 @@ def explore_links(page_url, page_name, links_found, msgs):
msgs += f"\nFound {page_name} link without href {link.text}"
else:
msgs += f"\nFound extra {page_name} link {link.text}"
return legit_found_links
return legit_found_links, msgs

packages_found = {name: False for name in packages.keys()}
releases_found = {name: False for releases in packages.values() for name in releases}
msgs = ""
found_release_links = explore_links(simple_url, "simple", packages_found, msgs)
found_release_links, msgs = explore_links(simple_url, "simple", packages_found)
dl_links = []
for rel_link in found_release_links:
dl_links += explore_links(urljoin(simple_url, rel_link), "release", releases_found, msgs)
new_links, new_msgs = explore_links(
urljoin(simple_url, rel_link), "release", releases_found
)
dl_links += new_links
msgs += new_msgs
for dl_link in dl_links:
package_link, _, sha = dl_link.partition("#sha256=")
if len(sha) != 64:
Expand Down
Loading