From ec81bfa0b1804b1811d75ab6fe6764f504bb99bd Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jkukkonen@google.com>
Date: Tue, 10 Dec 2024 20:41:58 +0200
Subject: [PATCH] tests: Simplify test data generation

We always want to either verify or generate new results:
don't have multiple arguments.

Also fix annotated types.

Signed-off-by: Jussi Kukkonen <jkukkonen@google.com>
---
 tests/generated_data/generate_md.py | 17 +++++++----------
 tests/test_metadata_generation.py   |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/generated_data/generate_md.py b/tests/generated_data/generate_md.py
index caddf255..c7cabeec 100644
--- a/tests/generated_data/generate_md.py
+++ b/tests/generated_data/generate_md.py
@@ -77,15 +77,13 @@ def verify_generation(md: Metadata, path: str) -> None:
             )
 
 
-def generate_all_files(
-    dump: bool | None = False, verify: bool | None = False
-) -> None:
-    """Generate a new repository and optionally verify it.
+def generate_all_files(dump: bool = False) -> None:
+    """Generate a new repository or verify that output has not changed.
 
     Args:
-        dump: Wheter to dump the newly generated files.
-        verify: Whether to verify the newly generated files with the
-            local staored.
+        dump: If True, new files are generated. If False, existing files
+           are compared to generated files and an exception is raised if
+           there are differences.
     """
     md_root = Metadata(Root(expires=EXPIRY))
     md_timestamp = Metadata(Timestamp(expires=EXPIRY))
@@ -106,11 +104,10 @@ def generate_all_files(
             "ed25519_metadata",
             f"{md.signed.type}_with_ed25519.json",
         )
-        if verify:
-            verify_generation(md, path)
-
         if dump:
             md.to_file(path, SERIALIZER)
+        else:
+            verify_generation(md, path)
 
 
 if __name__ == "__main__":
diff --git a/tests/test_metadata_generation.py b/tests/test_metadata_generation.py
index df99819f..03cc5ab6 100644
--- a/tests/test_metadata_generation.py
+++ b/tests/test_metadata_generation.py
@@ -16,7 +16,7 @@ class TestMetadataGeneration(unittest.TestCase):
     @staticmethod
     def test_compare_static_md_to_generated() -> None:
         # md_generator = MetadataGenerator("generated_data/ed25519_metadata")
-        generate_all_files(dump=False, verify=True)
+        generate_all_files(dump=False)
 
 
 # Run unit test.