Skip to content

Remove root from snapshot #988

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

Merged
merged 8 commits into from
Mar 11, 2020
Merged

Remove root from snapshot #988

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0c97271
Remove root from snapshot
joshuagl Feb 18, 2020
8f13fe5
Update tests for removal of root.json from snapshot.json
joshuagl Feb 27, 2020
8dfee1a
Update docs/METADATA.md to reflect recent spec change
joshuagl Feb 27, 2020
8dafe60
Update docstrings and comments for the Updater object
joshuagl Feb 28, 2020
a134db0
Update test repository data generator
joshuagl Feb 27, 2020
4bd9b5e
Improve determinism of test repository generator
joshuagl Mar 4, 2020
3720b23
Re-generate repository and client test metadata
joshuagl Feb 27, 2020
99ba904
Remove redundant code branch in Updater
joshuagl Mar 11, 2020
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
Prev Previous commit
Next Next commit
Update tests for removal of root.json from snapshot.json 
Signed-off-by: Joshua Lock <[email protected]>
  • Loading branch information
@joshuagl
joshuagl committed Mar 11, 2020
commit 8f13fe5added8fcfba91d4964015ed487999e116
17 changes: 6 additions & 11 deletions tests/test_repository_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,6 @@ def test_generate_snapshot_metadata(self):
metadata_directory = os.path.join(repository_directory,
repo_lib.METADATA_STAGED_DIRECTORY_NAME)
targets_directory = os.path.join(repository_directory, repo_lib.TARGETS_DIRECTORY_NAME)
root_filename = os.path.join(metadata_directory, repo_lib.ROOT_FILENAME)
targets_filename = os.path.join(metadata_directory,
repo_lib.TARGETS_FILENAME)
version = 1
Expand All @@ -453,12 +452,11 @@ def test_generate_snapshot_metadata(self):
with open(invalid_metadata_file, 'w') as file_object:
file_object.write('bad extension on metadata file')

root_filename = 'root'
targets_filename = 'targets'

snapshot_metadata = \
repo_lib.generate_snapshot_metadata(metadata_directory, version,
expiration_date, root_filename,
expiration_date,
targets_filename,
consistent_snapshot=False)
self.assertTrue(tuf.formats.SNAPSHOT_SCHEMA.matches(snapshot_metadata))
Expand All @@ -467,22 +465,19 @@ def test_generate_snapshot_metadata(self):
# Test improperly formatted arguments.
self.assertRaises(securesystemslib.exceptions.FormatError, repo_lib.generate_snapshot_metadata,
3, version, expiration_date,
root_filename, targets_filename, consistent_snapshot=False)
targets_filename, consistent_snapshot=False)
self.assertRaises(securesystemslib.exceptions.FormatError, repo_lib.generate_snapshot_metadata,
metadata_directory, '3', expiration_date,
root_filename, targets_filename, consistent_snapshot=False)
targets_filename, consistent_snapshot=False)
self.assertRaises(securesystemslib.exceptions.FormatError, repo_lib.generate_snapshot_metadata,
metadata_directory, version, '3',
root_filename, targets_filename, consistent_snapshot=False)
targets_filename, consistent_snapshot=False)
self.assertRaises(securesystemslib.exceptions.FormatError, repo_lib.generate_snapshot_metadata,
metadata_directory, version, expiration_date,
3, targets_filename, consistent_snapshot=False)
3, consistent_snapshot=False)
self.assertRaises(securesystemslib.exceptions.FormatError, repo_lib.generate_snapshot_metadata,
metadata_directory, version, expiration_date,
root_filename, 3, consistent_snapshot=False)
self.assertRaises(securesystemslib.exceptions.FormatError, repo_lib.generate_snapshot_metadata,
metadata_directory, version, expiration_date,
root_filename, targets_filename, 3)
targets_filename, 3)



Expand Down
1 change: 0 additions & 1 deletion tests/test_updater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,6 @@ def test_3__update_metadata_if_changed(self):
self.repository_updater._update_metadata('timestamp', DEFAULT_TIMESTAMP_FILELENGTH)
self.repository_updater._update_metadata_if_changed('snapshot', 'timestamp')
self.repository_updater._update_metadata_if_changed('targets')
self.repository_updater._update_metadata_if_changed('root')
targets_path = os.path.join(self.client_metadata_current, 'targets.json')
self.assertTrue(os.path.exists(targets_path))
self.assertTrue(self.repository_updater.metadata['current']['targets'])
Expand Down