Skip to content

Commit d7d4d33

Browse files
committed
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 <[email protected]>
1 parent 769f441 commit d7d4d33

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

tests/generated_data/generate_md.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
signers.append(CryptoSigner(private_key, key))
5757

5858
EXPIRY = datetime(2050, 1, 1, tzinfo=timezone.utc)
59-
OUT_DIR = "generated_data/ed25519_metadata"
60-
if not os.path.exists(OUT_DIR):
61-
os.mkdir(OUT_DIR)
6259

6360
SERIALIZER = JSONSerializer()
6461

@@ -103,7 +100,12 @@ def generate_all_files(
103100
for i, md in enumerate([md_root, md_timestamp, md_snapshot, md_targets]):
104101
assert isinstance(md, Metadata)
105102
md.sign(signers[i])
106-
path = os.path.join(OUT_DIR, f"{md.signed.type}_with_ed25519.json")
103+
path = os.path.join(
104+
utils.TESTS_DIR,
105+
"generated_data",
106+
"ed25519_metadata",
107+
f"{md.signed.type}_with_ed25519.json",
108+
)
107109
if verify:
108110
verify_generation(md, path)
109111

tests/test_utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"""
2020

2121
import logging
22+
import os
2223
import socket
2324
import sys
2425
import unittest
@@ -56,7 +57,7 @@ def test_simple_server_startup(self) -> None:
5657
def test_cleanup(self) -> None:
5758
# Test normal case
5859
server_process_handler = utils.TestServerProcess(
59-
log=logger, server="simple_server.py"
60+
log=logger, server=os.path.join(utils.TESTS_DIR, "simple_server.py")
6061
)
6162

6263
server_process_handler.clean()

0 commit comments

Comments
 (0)