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

Jump to bottom

experimental client: Remove mirrors #1373

Merged
merged 10 commits into from
May 12, 2021
Merged

experimental client: Remove mirrors #1373

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
80ff532
Download metadata from a single mirror
sechkova Apr 29, 2021
576d055
Drop mirrors support
sechkova Apr 29, 2021
45259cf
new updater: Seek to beginning of file after length check
May 4, 2021
5732163
new updater: remove unnecessary file objects
May 4, 2021
9fae500
new updater: Rename _get_target_hash()
May 4, 2021
888f022
new updater: Remove misleading comment
May 4, 2021
3a02583
Rename url prefixes so they are consistent
May 4, 2021
ab210b4
new updater: Clean up url handling
May 4, 2021
9605e19
new updater: Improve docstrings
May 7, 2021
ec4c5ce
tests: Don't use os.path.join() for URLS
May 12, 2021
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
9 changes: 4 additions & 5 deletions tests/test_updater_rework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,13 @@ def setUp(self):
# directory copied from the original repository files.
tuf.settings.repositories_directory = self.client_directory

self.repository_mirrors = {'mirror1': {'url_prefix': url_prefix,
'metadata_path': 'metadata',
'targets_path': 'targets'}}

metadata_url = os.path.join(url_prefix, 'metadata/')
targets_url = os.path.join(url_prefix, 'targets/')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: should this be urllib.parse.urljoin()?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I'll change that

Fact is that the test needs to be rewritten, it's copied from test_updater.py and is horribly complex and full of issues like this for (I assume) Historical Reasons... but I'm trying to limit scope so not fixing anything else here

# Creating a repository instance. The test cases will use this client
# updater to refresh metadata, fetch target files, etc.
self.repository_updater = updater.Updater(self.repository_name,
self.repository_mirrors)
metadata_url,
targets_url)

# Metadata role keys are needed by the test cases to make changes to the
# repository (e.g., adding a new target file to 'targets.json' and then
Expand Down
130 changes: 0 additions & 130 deletions tuf/client_rework/mirrors.py
View file
Open in desktop

This file was deleted.

Loading