Fix data dir lookup for static tests

pytest is not executed in the tuf_conformance source dir when the GitHub Action is used. Build the data dir as relative from simulator_server.py location. Signed-off-by: Jussi Kukkonen <[email protected]>
jku · Aug 19, 2024 · 56c2327 · 56c2327
1 parent 07b2952
commit 56c2327
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tuf_conformance/simulator_server.py b/tuf_conformance/simulator_server.py
@@ -88,10 +88,12 @@ def debug_dump(self, test_name: str) -> None:
 class StaticServer(ThreadingHTTPServer):
     """Web server to serve static repositories"""
 
+    data_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "static_data")
+
     def __init__(self) -> None:
         class _StaticReqHandler(BaseHTTPRequestHandler):
             def do_GET(self) -> None:  # noqa: N802
-                filepath = os.path.join("tuf_conformance", "static_data", self.path[1:])
+                filepath = os.path.join(StaticServer.data_dir, self.path[1:])
                 try:
                     with open(filepath, "rb") as f:
                         data = f.read()
@@ -108,7 +110,7 @@ def do_GET(self) -> None:  # noqa: N802
         self.timeout = 0
 
     def new_test(self, static_dir: str) -> tuple[ClientInitData, str]:
-        sub_dir = os.path.join("tuf_conformance", "static_data", static_dir)
+        sub_dir = os.path.join(self.data_dir, static_dir)
         with open(os.path.join(sub_dir, "initial_root.json"), "rb") as f:
             initial_root = f.read()
 

diff --git a/tuf_conformance/test_static_repositories.py b/tuf_conformance/test_static_repositories.py
@@ -6,8 +6,8 @@
 from tuf_conformance.simulator_server import StaticServer
 
 static_repos = []
-for static_dir in os.listdir(os.path.join("tuf_conformance", "static_data")):
-    if os.path.isdir(os.path.join("tuf_conformance", "static_data", static_dir)):
+for static_dir in os.listdir(StaticServer.data_dir):
+    if os.path.isdir(os.path.join(StaticServer.data_dir, static_dir)):
         static_repos.append(static_dir)