Skip to content

Commit 4267abc

Browse files
committed
Fix formatiing and linter issues
Fix formatting and some potential linter and typing errors. Signed-off-by: Teodora Sechkova <tsechkova@vmware.com>
1 parent 5394c47 commit 4267abc

File tree

1 file changed

+40
-22
lines changed

1 file changed

+40
-22
lines changed

tests/test_updater_top_level_update.py

+40-22
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
import os
99
import sys
1010
import tempfile
11-
from typing import List, Optional
1211
import unittest
1312
from datetime import datetime, timedelta
13+
from typing import Iterable, Optional
1414

1515
from tests import utils
1616
from tests.repository_simulator import RepositorySimulator
17-
from tuf.api.metadata import Metadata, TOP_LEVEL_ROLE_NAMES
17+
from tuf.api.metadata import TOP_LEVEL_ROLE_NAMES, Metadata
1818
from tuf.exceptions import (
1919
BadVersionNumberError,
2020
ExpiredMetadataError,
@@ -24,13 +24,14 @@
2424
)
2525
from tuf.ngclient import Updater
2626

27+
2728
class TestRefresh(unittest.TestCase):
2829
"""Test update of top-level metadata following
2930
'Detailed client workflow' in the specification."""
3031

3132
past_datetime = datetime.utcnow().replace(microsecond=0) - timedelta(days=5)
3233

33-
def setUp(self):
34+
def setUp(self) -> None:
3435
self.temp_dir = tempfile.TemporaryDirectory()
3536
self.metadata_dir = os.path.join(self.temp_dir.name, "metadata")
3637
self.targets_dir = os.path.join(self.temp_dir.name, "targets")
@@ -45,7 +46,7 @@ def setUp(self):
4546
)
4647
f.write(root)
4748

48-
def tearDown(self):
49+
def tearDown(self) -> None:
4950
self.temp_dir.cleanup()
5051

5152
def _run_refresh(self) -> Updater:
@@ -68,13 +69,15 @@ def _init_updater(self) -> Updater:
6869
fetcher=self.sim,
6970
)
7071

71-
def _assert_files_exist(self, roles: List[str]) -> None:
72+
def _assert_files_exist(self, roles: Iterable[str]) -> None:
7273
"""Assert that local metadata files exist for 'roles'"""
7374
expected_files = sorted([f"{role}.json" for role in roles])
7475
local_metadata_files = sorted(os.listdir(self.metadata_dir))
7576
self.assertListEqual(local_metadata_files, expected_files)
7677

77-
def _assert_content_equals(self, role: str, version: Optional[int]=None) -> None:
78+
def _assert_content_equals(
79+
self, role: str, version: Optional[int] = None
80+
) -> None:
7881
"""Assert that local file content is the expected"""
7982
expected_content = self.sim._fetch_metadata(role, version)
8083
with open(os.path.join(self.metadata_dir, f"{role}.json"), "rb") as f:
@@ -166,7 +169,8 @@ def test_max_root_rotations(self) -> None:
166169

167170
updater.refresh()
168171

169-
# Assert that root version was increased with no more than 'max_root_rotations'
172+
# Assert that root version was increased with no more
173+
# than 'max_root_rotations'
170174
md_root = Metadata.from_file(root_path)
171175
self.assertEqual(
172176
md_root.signed.version,
@@ -195,7 +199,6 @@ def test_intermediate_root_incorrectly_signed(self) -> None:
195199
self._assert_files_exist(["root"])
196200
self._assert_content_equals("root", 1)
197201

198-
199202
def test_intermediate_root_expired(self) -> None:
200203
# The expiration of the new (intermediate) root metadata file
201204
# does not matter yet
@@ -218,7 +221,7 @@ def test_intermediate_root_expired(self) -> None:
218221

219222
def test_final_root_incorrectly_signed(self) -> None:
220223
# Check for an arbitrary software attack
221-
self.sim.root.version += 1 # root v2
224+
self.sim.root.version += 1 # root v2
222225
self.sim.signers["root"].clear()
223226
self.sim.publish_root()
224227

@@ -282,23 +285,27 @@ def test_new_timestamp_version_rollback(self) -> None:
282285
with self.assertRaises(ReplayedMetadataError):
283286
self._run_refresh()
284287

285-
md_timestamp = Metadata.from_file(os.path.join(self.metadata_dir, "timestamp.json"))
288+
md_timestamp = Metadata.from_file(
289+
os.path.join(self.metadata_dir, "timestamp.json")
290+
)
286291
self.assertEqual(md_timestamp.signed.version, 2)
287292

288293
def test_new_timestamp_snapshot_rollback(self) -> None:
289294
# Check for a rollback attack.
290295
self.sim.snapshot.version = 2
291-
self.sim.update_timestamp() # timestamp v2
296+
self.sim.update_timestamp() # timestamp v2
292297
self._run_refresh()
293298

294299
# Snapshot meta version is smaller than previous
295300
self.sim.timestamp.snapshot_meta.version = 1
296-
self.sim.timestamp.version += 1 # timestamp v3
301+
self.sim.timestamp.version += 1 # timestamp v3
297302

298303
with self.assertRaises(ReplayedMetadataError):
299304
self._run_refresh()
300305

301-
md_timestamp = Metadata.from_file(os.path.join(self.metadata_dir, "timestamp.json"))
306+
md_timestamp = Metadata.from_file(
307+
os.path.join(self.metadata_dir, "timestamp.json")
308+
)
302309
self.assertEqual(md_timestamp.signed.version, 2)
303310

304311
def test_new_timestamp_expired(self) -> None:
@@ -316,24 +323,28 @@ def test_new_snapshot_hash_mismatch(self) -> None:
316323

317324
# Update timestamp with snapshot's hashes
318325
self.sim.compute_metafile_hashes_length = True
319-
self.sim.update_timestamp() # timestamp v2
326+
self.sim.update_timestamp() # timestamp v2
320327
self._run_refresh()
321328

322329
# Modify snapshot contents without updating
323330
# timestamp's snapshot hash
324331
self.sim.snapshot.expires += timedelta(days=1)
325332
self.sim.snapshot.version += 1 # snapshot v2
326333
self.sim.timestamp.snapshot_meta.version = self.sim.snapshot.version
327-
self.sim.timestamp.version += 1 # timestamp v3
334+
self.sim.timestamp.version += 1 # timestamp v3
328335

329336
# Hash mismatch error
330337
with self.assertRaises(RepositoryError):
331338
self._run_refresh()
332339

333-
md_timestamp = Metadata.from_file(os.path.join(self.metadata_dir, "timestamp.json"))
340+
md_timestamp = Metadata.from_file(
341+
os.path.join(self.metadata_dir, "timestamp.json")
342+
)
334343
self.assertEqual(md_timestamp.signed.version, 3)
335344

336-
md_snapshot = Metadata.from_file(os.path.join(self.metadata_dir, "snapshot.json"))
345+
md_snapshot = Metadata.from_file(
346+
os.path.join(self.metadata_dir, "snapshot.json")
347+
)
337348
self.assertEqual(md_snapshot.signed.version, 1)
338349

339350
def test_new_snapshot_unsigned(self) -> None:
@@ -370,7 +381,9 @@ def test_new_snapshot_version_rollback(self) -> None:
370381
with self.assertRaises(ReplayedMetadataError):
371382
self._run_refresh()
372383

373-
md_snapshot = Metadata.from_file(os.path.join(self.metadata_dir, "snapshot.json"))
384+
md_snapshot = Metadata.from_file(
385+
os.path.join(self.metadata_dir, "snapshot.json")
386+
)
374387
self.assertEqual(md_snapshot.signed.version, 2)
375388

376389
def test_new_snapshot_expired(self) -> None:
@@ -383,7 +396,6 @@ def test_new_snapshot_expired(self) -> None:
383396

384397
self._assert_files_exist(["root", "timestamp"])
385398

386-
387399
def test_new_targets_hash_mismatch(self) -> None:
388400
# Check against snapshot role’s targets hashes
389401

@@ -395,17 +407,23 @@ def test_new_targets_hash_mismatch(self) -> None:
395407
# Modify targets contents without updating
396408
# snapshot's targets hashes
397409
self.sim.targets.version += 1
398-
self.sim.snapshot.meta["targets.json"].version = self.sim.targets.version
410+
self.sim.snapshot.meta[
411+
"targets.json"
412+
].version = self.sim.targets.version
399413
self.sim.snapshot.version += 1
400414
self.sim.update_timestamp()
401415

402416
with self.assertRaises(RepositoryError):
403417
self._run_refresh()
404418

405-
md_snapshot = Metadata.from_file(os.path.join(self.metadata_dir, "snapshot.json"))
419+
md_snapshot = Metadata.from_file(
420+
os.path.join(self.metadata_dir, "snapshot.json")
421+
)
406422
self.assertEqual(md_snapshot.signed.version, 3)
407423

408-
md_targets = Metadata.from_file(os.path.join(self.metadata_dir, "targets.json"))
424+
md_targets = Metadata.from_file(
425+
os.path.join(self.metadata_dir, "targets.json")
426+
)
409427
self.assertEqual(md_targets.signed.version, 1)
410428

411429
def test_new_targets_unsigned(self) -> None:

0 commit comments

Comments
 (0)