update ci.yml, touch.cwl and fix tests

Parsl · Feb 17, 2024 · 5c2077e · 5c2077e
1 parent c505a4d
commit 5c2077e
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 36 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,10 +13,9 @@ jobs:
     strategy:
       fail-fast: false # if true, then if one task fails all fails, but we need which version is failing
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
         python-version:
           - "3.9"
-          - "3.12"
 
     name: Test
     runs-on: ${{ matrix.os }}

diff --git a/tests/test_correctness.py b/tests/test_correctness.py
@@ -14,39 +14,41 @@
 test_report_files = os.path.join(os.getcwd(), "tests", "test-reports")
 
 
-# def test_find() -> None:
-#     """Test for the find CWL CommandLineTool."""
-#     # Test 1
-#     find(
-#         dir=".",
-#         maxdepth=3,
-#         name="*.cwl",
-#         redirect_to_file=os.path.join(test_runtime_files, "find_stdout_1.txt"),
-#         output_file=File(os.path.join(test_runtime_files, "find_stdout_1.txt")),
-#     ).result()
-
-#     # Test 2
-#     find(
-#         dir=".",
-#         name="*.cwl",
-#         redirect_to_file=os.path.join(test_runtime_files, "find_stdout_2.txt"),
-#         output_file=File(os.path.join(test_runtime_files, "find_stdout_2.txt")),
-#     ).result()
-
-
-# def test_touch() -> None:
-#     """Test for the touch CWL CommandLineTool."""
-#     # Test 1
-#     touch(
-#         filenames=[
-#             os.path.join(test_runtime_files, "touch1.txt"),
-#             os.path.join(test_runtime_files, "touch2.txt"),
-#         ],
-#         output_files=[
-#             File(os.path.join(test_runtime_files, "touch1.txt")),
-#             File(os.path.join(test_runtime_files, "touch2.txt")),
-#         ],
-#     ).result()
+def test_find() -> None:
+    """Test for the find CWL CommandLineTool."""
+    # Test 1
+    find(
+        dir=".",
+        maxdepth=3,
+        name="*.cwl",
+        redirect_to_file=os.path.join(test_runtime_files, "find_stdout_1.txt"),
+        output_file=File(os.path.join(test_runtime_files, "find_stdout_1.txt")),
+    ).result()
+
+    # Test 2
+    find(
+        dir=".",
+        name="*.cwl",
+        redirect_to_file=os.path.join(test_runtime_files, "find_stdout_2.txt"),
+        output_file=File(os.path.join(test_runtime_files, "find_stdout_2.txt")),
+    ).result()
+
+
+def test_touch() -> None:
+    """Test for the touch CWL CommandLineTool."""
+    # Test 1
+    touch(
+        filenames=[
+            os.path.join(test_runtime_files, "test1.txt"),
+            os.path.join(test_runtime_files, "test2.txt"),
+        ],
+        output_files=[
+            File(os.path.join(test_runtime_files, "test1.txt")),
+            File(os.path.join(test_runtime_files, "test2.txt")),
+        ],
+        stdout=os.path.join(test_runtime_files, "touch_stdout.stdout"),
+        stderr=os.path.join(test_runtime_files, "touch_stderr.stderr"),
+    ).result()
 
 
 def test_word_count() -> None:

diff --git a/tools/cwl_files/touch.cwl b/tools/cwl_files/touch.cwl
@@ -14,4 +14,8 @@ outputs:
     type: array
     items: File
     outputBinding:
-      glob: $(inputs.filenames)
+      glob: $(inputs.filenames)
+  stdout:
+    type: stdout
+  stderr:
+    type: stderr