test: make single-task job fixtures assert their own output

conformance-tests/2023-09/EXPR/jobs/2.13--list-int-merged-default-compatible.test.yaml

@@ -15,10 +15,21 @@ template:
   steps:
   - name: Step1
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["LEN:3", "SUM:6"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'LEN:{{ len(Param.Values) }}')

conformance-tests/2023-09/EXPR/jobs/2.13--list-int-supplied-value-within-constraints.test.yaml

@@ -16,10 +16,21 @@ template:
   steps:
   - name: Step1
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["LEN:3", "SUM:15"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'LEN:{{ len(Param.Values) }}')

conformance-tests/2023-09/EXPR/jobs/2.16--list-list-int-param-runtime.test.yaml

@@ -10,10 +10,21 @@ template:
   steps:
   - name: Step1
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["LEN:3", "ROW0:[1, 2]", "ELEM:3", "FLAT:[1, 2, 3, 4, 5, 6]"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'LEN:{{ len(Param.Matrix) }}')

conformance-tests/2023-09/EXPR/jobs/2.9--bool-param-runtime.test.yaml

@@ -13,10 +13,21 @@ template:
   steps:
   - name: Step1
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["GPU:yes", "DEBUG:no", "NOT:true"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'GPU:{{ "yes" if Param.UseGpu else "no" }}')

conformance-tests/2023-09/EXPR/jobs/3.6--let-binding-with-param.test.yaml

@@ -12,10 +12,21 @@ template:
     let:
     - "doubled = Param.X * 2"
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["OUT:10"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - print(r'OUT:{{ doubled }}')
 expected:

conformance-tests/2023-09/EXPR/jobs/3.6--let-env-script-binding.test.yaml

@@ -17,10 +17,21 @@ template:
   steps:
   - name: Step1
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["ENV:hello"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - import os; print('ENV:' + os.environ.get('GREETING', ''))
 expected:

conformance-tests/2023-09/EXPR/jobs/3.6--let-in-host-requirements.test.yaml

@@ -17,10 +17,21 @@ template:
       - name: amount.worker.gpu
         min: "{{ gpu_count }}"
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["GPU:1"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'GPU:{{ gpu_count }}')

conformance-tests/2023-09/EXPR/jobs/3.6--let-scopes.test.yaml

@@ -10,10 +10,21 @@ template:
     script:
       let:
       - "script_val = 20"
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["STEP:10", "SCRIPT:20", "SUM:30"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'STEP:{{ step_val }}')

conformance-tests/2023-09/EXPR/jobs/3.6--let-script-binding.test.yaml

@@ -10,10 +10,21 @@ template:
       - "x = 1"
       - "y = x + 1"
       - "z = y * 3"
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["X:1", "Y:2", "Z:6"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'X:{{ x }}')

conformance-tests/2023-09/EXPR/jobs/3.6--let-step-binding.test.yaml

@@ -9,10 +9,21 @@ template:
     - "base = 100"
     - "doubled = base * 2"
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["BASE:100", "DOUBLED:200"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'BASE:{{ base }}')

conformance-tests/2023-09/EXPR/jobs/3.6--let-step-env-binding.test.yaml

@@ -19,10 +19,21 @@ template:
             - -c
             - "print('openjd_env: MSG={{ combined }}')"
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["MSG:HELLO_WORLD"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - import os; print('MSG:' + os.environ.get('MSG', ''))
 expected:

conformance-tests/2023-09/EXPR/jobs/7.3--host-context-symbols.test.yaml

@@ -6,10 +6,21 @@ template:
   steps:
   - name: Step1
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["WD_LEN:true", "WD_IS_PATH:true", "HAS_PM:false", "HAS_PM_COND:no", "PM_FILE_IS_PATH:.json"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'WD_LEN:{{ len(string(Session.WorkingDirectory)) > 0 }}')

conformance-tests/2023-09/EXPR/jobs/7.3--task-file-expr-properties.test.yaml

@@ -11,6 +11,13 @@ template:
   - name: Step1
     script:
       embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["EXISTS:True", "CONTENT:greeting=hello", "HAS_PARENT:true"]}
       - name: config
         type: TEXT
         data: "greeting={{Param.Greeting}}"
@@ -21,6 +28,9 @@ template:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             import os

conformance-tests/2023-09/EXPR/jobs/expr1.1.3--keyword-attrs-in-exprs.test.yaml

@@ -129,10 +129,21 @@ template:
   steps:
   - name: Step1
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["False:v_False", "None:v_None", "True:v_True", "and:v_and", "as:v_as", "assert:v_assert", "async:v_async", "await:v_await", "break:v_break", "class:v_class", "continue:v_continue", "def:v_def", "del:v_del", "elif:v_elif", "else:v_else", "except:v_except", "finally:v_finally", "for:v_for", "from:v_from", "global:v_global", "if:v_if", "import:v_import", "in:v_in", "is:v_is", "lambda:v_lambda", "nonlocal:v_nonlocal", "not:v_not", "or:v_or", "pass:v_pass", "raise:v_raise", "return:v_return", "try:v_try", "while:v_while", "with:v_with", "yield:v_yield", "_:v__", "case:v_case", "match:v_match", "type:v_type", "COND:v_if", "LOGIC:v_and"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'False:{{ Param.False }}')

conformance-tests/2023-09/EXPR/jobs/expr1.1.5--string-literals.test.yaml

@@ -11,10 +11,21 @@ template:
     - "rtdq = r\"\"\"raw\\ntriple\"\"\""
     - "rtsq = r'''raw\\ntriple'''"
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["DQ:5", "SQ:5", "RDQ:hello\\n", "RSQ:hello\\n", "RDQ_LEN:7", "RSQ_LEN:7", "ESC_LEN:11", "ESC_T_LEN:3", "ESC_BS:a\\b", "RAW_BS:C:\\Users\\test", "TDQ_LEN:13", "TSQ_LEN:13", "RTDQ:raw\\ntriple", "RTSQ:raw\\ntriple"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'DQ:{{ len("hello") }}')

conformance-tests/2023-09/EXPR/jobs/expr1.1.6--numeric-literals.test.yaml

@@ -6,10 +6,21 @@ template:
   steps:
   - name: Step1
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["HEX:42", "OCT:42", "BIN:42", "USCORE:1000000", "SCI_PASS:1.5e3", "SCI_NEG_PASS:1.5e-3", "SCI_ADD:1500.0", "SCI_NEG_ADD:0.0015", "SCI_POS:1500.0", "SCI_NEG_POS:0.0015", "HEX_US:65535", "BIN_US:170"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'HEX:{{ 0x2A }}')

conformance-tests/2023-09/EXPR/jobs/expr1.1.7--multiline.test.yaml

@@ -6,10 +6,21 @@ template:
   steps:
   - name: Step1
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["ARITH:6", "COND:high", "COMP:[4, 6]"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'ARITH:{{ 1 +

conformance-tests/2023-09/EXPR/jobs/expr1.2.3--implicit-coercion.test.yaml

@@ -10,10 +10,21 @@ template:
     - 'path_join = [path("/a"), path("/b")].join(",")'
     - 'path_sw = startswith(path("/mnt/out"), "/mnt")'
     script:
+      embeddedFiles:
+      - name: OpenJDConformanceAssert
+        type: TEXT
+        dataFile: _conformance_assert.py
+      - name: OpenJDConformanceExpect
+        type: TEXT
+        data: |
+          {"expected": ["INTFLOAT:3.5", "PATHSTR:true", "RANGECAT:[10, 20, 1, 2, 3]", "RANGE_STR:1-3", "RANGE_FMT:frames=1-3", "RANGE_ADD:frames: 1-3", "RANGE_ADD2:1-3 are frames", "FMT_EMBED:Count is 3 items", "BOOL_FMT:val=true", "LIST_PATH_STR:/a,/b"]}
       actions:
         onRun:
           command: python
           args:
+          - '{{Task.File.OpenJDConformanceAssert}}'
+          - '{{Task.File.OpenJDConformanceExpect}}'
+          - python
           - -c
           - |
             print(r'INTFLOAT:{{ 2 + 1.5 }}')