dev: updated tests

Author: Stellatsuu

test/test_execution_hooks_core.py

@@ -177,7 +177,7 @@ def test_from_cwl(self, mocker):
         mock_cwl = mocker.Mock()
         mock_cwl.hints = [
             {
-                "class": "dirac:execution-hooks",
+                "class": "dirac:ExecutionHooksHint",
                 "hook_plugin": "QueryBased",
                 "campaign": "Run3",
             },
@@ -254,7 +254,7 @@ def test_from_cwl(self, mocker):
         mock_cwl = mocker.Mock()
         mock_cwl.hints = [
             {
-                "class": "dirac:scheduling",
+                "class": "dirac:SchedulingHint",
                 "platform": "DIRAC-v8",
                 "priority": 8,
                 "sites": ["LCG.CERN.ch"],

test/test_workflows.py

@@ -88,13 +88,12 @@ def pi_test_files():
         ),
         # --- Test metadata example ---
         # A string input is passed
-        # (
-        # TODO doesn't work since it doesn't override anymore
-        # "test/workflows/test_meta/test_meta.cwl",
-        # [
-        #     "test/workflows/test_meta/override_dirac_hints.yaml",
-        # ],
-        # ),
+        (
+            "test/workflows/test_meta/test_meta.cwl",
+            [
+                "test/workflows/test_meta/override_dirac_hints.yaml",
+            ],
+        ),
         # --- Crypto example ---
         # Complete
         (

test/workflows/pi/description.cwl

@@ -6,6 +6,12 @@ doc: >
   It generates random points in a square and calculates how many fall within
   a unit circle inscribed in the square.
 
+$namespaces:
+  dirac: "../../schemas/dirac-metadata.json#/$defs/"
+
+$schemas:
+  - "../../schemas/dirac-metadata.json"
+
 # Define the inputs of the workflow
 inputs:
   num-points:

test/workflows/pi/pigather.cwl

@@ -6,12 +6,6 @@ requirements:
     coresMin: 1
     ramMin: 1024
 
-$namespaces:
-  dirac: "../../schemas/dirac-metadata.json#/$defs/"
-
-$schemas:
-  - "../../schemas/dirac-metadata.json"
-
 hints:
   $import: "type_dependencies/transformation/metadata-pi_gather.yaml"
 

test/workflows/pi/pisimulate.cwl

@@ -6,12 +6,6 @@ requirements:
     coresMin: 2
     ramMin: 1024
 
-$namespaces:
-  dirac: "../../schemas/dirac-metadata.json#/$defs/"
-
-$schemas:
-  - "../../schemas/dirac-metadata.json"
-
 hints:
   $import: "type_dependencies/transformation/metadata-pi_simulate.yaml"
 

test/workflows/test_meta/test_meta.cwl

@@ -17,7 +17,10 @@ $schemas:
 
 hints:
   - class: dirac:ExecutionHooksHint
-    hook_plugin: "QueryBased" # should be overrided by inputs with cwl:override (how?)
+    # TODO: initial value is "QueryBased" (?):
+    # it should be overrided by inputs with cwl:override (how?)
+    # to make the test work, we'll put QueryBasedPlugin for now.
+    hook_plugin: "QueryBasedPlugin"
     configuration:
       campaign: PROD5
       site: LaPalma