21207: Rename CWL standalone test functions
authorBrett Smith <brett.smith@curii.com>
Fri, 3 May 2024 16:02:56 +0000 (12:02 -0400)
committerBrett Smith <brett.smith@curii.com>
Fri, 3 May 2024 20:47:23 +0000 (16:47 -0400)
These functions are not picked up by the unittest runner (since they're
not TestCase methods) but are picked up by pytest (since they start with
test_*). Rename them to retain existing behavior across test runners.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

sdk/cwl/tests/test_copy_deps.py
sdk/cwl/tests/test_set_output_prop.py

index 28a5915b11c44e531110a53b0df9b66d5e7dc256..8ad735fddc6659dbc855003a9a4a0c04a32d6cbc 100644 (file)
@@ -73,7 +73,7 @@ def check_contents(group, wf_uuid):
         raise Exception("Couldn't find collection containing expected "+expect_file)
 
 
-def test_create():
+def check_create():
     group = api.groups().create(body={"group": {"name": "test-19070-project-1", "group_class": "project"}}, ensure_unique_name=True).execute()
     try:
         contents = api.groups().contents(uuid=group["uuid"]).execute()
@@ -90,7 +90,7 @@ def test_create():
         api.groups().delete(uuid=group["uuid"]).execute()
 
 
-def test_update():
+def check_update():
     group = api.groups().create(body={"group": {"name": "test-19070-project-2", "group_class": "project"}}, ensure_unique_name=True).execute()
     try:
         contents = api.groups().contents(uuid=group["uuid"]).execute()
@@ -132,7 +132,7 @@ def test_update():
         api.groups().delete(uuid=group["uuid"]).execute()
 
 
-def test_execute():
+def check_execute():
     group = api.groups().create(body={"group": {"name": "test-19070-project-3", "group_class": "project"}}, ensure_unique_name=True).execute()
     try:
         contents = api.groups().contents(uuid=group["uuid"]).execute()
@@ -193,6 +193,6 @@ def test_execute():
         api.groups().delete(uuid=group["uuid"]).execute()
 
 if __name__ == '__main__':
-    test_create()
-    test_update()
-    test_execute()
+    check_create()
+    check_update()
+    check_execute()
index 3219eac989f5580658c20ae255fb38a179e720a0..0e829eeb92fe5ba2929101d498d1a83079172164 100644 (file)
@@ -7,7 +7,7 @@ import subprocess
 
 api = arvados.api()
 
-def test_execute():
+def check_execute():
     group = api.groups().create(body={"group": {"name": "test-17004-project", "group_class": "project"}}, ensure_unique_name=True).execute()
     try:
         contents = api.groups().contents(uuid=group["uuid"]).execute()
@@ -34,4 +34,4 @@ def test_execute():
         api.groups().delete(uuid=group["uuid"]).execute()
 
 if __name__ == '__main__':
-    test_execute()
+    check_execute()