From 9946dc5277d672980e44eedcab0aed748cf60305 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 10 Dec 2024 20:03:34 +0200 Subject: [PATCH] tests: Make sure tests can execute from root source dir "python -m unittest" now works in the root source dir too Signed-off-by: Jussi Kukkonen --- tests/generated_data/generate_md.py | 10 ++++++---- tests/test_utils.py | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/generated_data/generate_md.py b/tests/generated_data/generate_md.py index 6a820fa1..caddf255 100644 --- a/tests/generated_data/generate_md.py +++ b/tests/generated_data/generate_md.py @@ -56,9 +56,6 @@ signers.append(CryptoSigner(private_key, key)) EXPIRY = datetime(2050, 1, 1, tzinfo=timezone.utc) -OUT_DIR = "generated_data/ed25519_metadata" -if not os.path.exists(OUT_DIR): - os.mkdir(OUT_DIR) SERIALIZER = JSONSerializer() @@ -103,7 +100,12 @@ def generate_all_files( for i, md in enumerate([md_root, md_timestamp, md_snapshot, md_targets]): assert isinstance(md, Metadata) md.sign(signers[i]) - path = os.path.join(OUT_DIR, f"{md.signed.type}_with_ed25519.json") + path = os.path.join( + utils.TESTS_DIR, + "generated_data", + "ed25519_metadata", + f"{md.signed.type}_with_ed25519.json", + ) if verify: verify_generation(md, path) diff --git a/tests/test_utils.py b/tests/test_utils.py index cdb68905..fcdc3c44 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -19,6 +19,7 @@ """ import logging +import os import socket import sys import unittest @@ -56,7 +57,7 @@ def test_simple_server_startup(self) -> None: def test_cleanup(self) -> None: # Test normal case server_process_handler = utils.TestServerProcess( - log=logger, server="simple_server.py" + log=logger, server=os.path.join(utils.TESTS_DIR, "simple_server.py") ) server_process_handler.clean()