tests: reuse centrally defined input variables (#28)

elixir-cloud-aai · Aug 19, 2024 · 41ba2a4 · 41ba2a4
1 parent 40c1ab7
commit 41ba2a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/tests/tasks/task_bodies.py b/tests/tasks/task_bodies.py
@@ -1,23 +1,19 @@
 """TES task request bodies used by tests"""
 
-from pathlib import Path
-
-DIR = Path(__file__).parents[2]
-input_dir = DIR / "inputs"
-
+from tests.utils import INPUT_DIR
 
 def get_uppercase_task_body(tmp_dir):
     """Returns TES task body that makes the contents of a file uppercase."""
     return {
         "name": "Hello world",
         "inputs": [
             {
-                "url": f"file://{input_dir}/hello.txt",
+                "url": f"file://{INPUT_DIR}/hello.txt",
                 "path": "/inputs/hello.txt",
                 "type": "FILE"
             },
             {
-                "url": f"file://{input_dir}/make_uppercase.py",
+                "url": f"file://{INPUT_DIR}/make_uppercase.py",
                 "path": "/inputs/make_uppercase.py",
                 "type": "FILE"
             }
@@ -49,17 +45,17 @@ def get_decryption_task_body(tmp_dir):
         "name": "Decrypt with secret key as environment variable",
         "inputs": [
             {
-                "url": f"file://{input_dir}/hello.c4gh",
+                "url": f"file://{INPUT_DIR}/hello.c4gh",
                 "path": "/inputs/hello.c4gh",
                 "type": "FILE"
             },
             {
-                "url": f"file://{input_dir}/alice.sec",
+                "url": f"file://{INPUT_DIR}/alice.sec",
                 "path": "/inputs/alice.sec",
                 "type": "FILE"
             },
             {
-                "url": f"file://{input_dir}/decrypt.sh",
+                "url": f"file://{INPUT_DIR}/decrypt.sh",
                 "path": "/inputs/decrypt.sh",
                 "type": "FILE"
             }
@@ -91,22 +87,22 @@ def get_uppercase_task_with_decryption_body(tmp_dir):
         "name": "Decrypt with secret key as environment variable",
         "inputs": [
             {
-                "url": f"file://{input_dir}/hello.c4gh",
+                "url": f"file://{INPUT_DIR}/hello.c4gh",
                 "path": "/inputs/hello.c4gh",
                 "type": "FILE"
             },
             {
-                "url": f"file://{input_dir}/alice.sec",
+                "url": f"file://{INPUT_DIR}/alice.sec",
                 "path": "/inputs/alice.sec",
                 "type": "FILE"
             },
             {
-                "url": f"file://{input_dir}/decrypt.sh",
+                "url": f"file://{INPUT_DIR}/decrypt.sh",
                 "path": "/inputs/decrypt.sh",
                 "type": "FILE"
             },
             {
-                "url": f"file://{input_dir}/make_uppercase.py",
+                "url": f"file://{INPUT_DIR}/make_uppercase.py",
                 "path": "/inputs/make_uppercase.py",
                 "type": "FILE"
             }

diff --git a/tests/tasks/test_tasks.py b/tests/tasks/test_tasks.py
@@ -13,12 +13,11 @@
     get_uppercase_task_body,
     get_uppercase_task_with_decryption_body,
 )
-from tests.utils import timeout
+from tests.utils import INPUT_TEXT, timeout
 
 TES_URL = "http://localhost:8090/ga4gh/tes/v1"
 HEADERS = {"accept": "application/json", "Content-Type": "application/json"}
 WAIT_STATUSES = ("UNKNOWN", "INITIALIZING", "RUNNING", "QUEUED")
-INPUT_TEXT = "hello world from the input!"
 
 
 def wait_for_file_download(filename, output_path):