Fail steps/tests/suites when expressions throw exceptions

.github/workflows/push.yaml

@@ -39,7 +39,7 @@ jobs:
 
       - name: Setup Fixtures
         run: |
-          docker-compose -f examples/docker-compose.yaml up -d
+          docker compose -f examples/docker-compose.yaml up -d
 
       - name: Run Intro Examples
         run: |
@@ -50,7 +50,7 @@ jobs:
             -v $(pwd)/examples:/app/examples \
             dctest --results-file /app/examples/results.json examples /app/examples/00-intro.yaml \
             || true
-          jq --exit-status '[.pass == 4, .fail == 0] | all' examples/results.json
+          jq --exit-status '[.pass == 5, .fail == 0] | all' examples/results.json
 
       - name: Run Intro + Fail Examples with --continue-on-error
         run: |
@@ -61,7 +61,7 @@ jobs:
             -v $(pwd)/examples:/app/examples \
             dctest --continue-on-error --results-file /app/examples/results.json examples /app/examples/00-intro.yaml /app/examples/01-fails.yaml \
             || true
-          jq --exit-status '[.pass == 5, .fail == 3] | all' examples/results.json
+          jq --exit-status '[.pass == 6, .fail == 4] | all' examples/results.json
 
       - name: Run Dependency Examples
         run: |
@@ -78,4 +78,4 @@ jobs:
       - name: Setup Fixtures
         if: always()
         run: |
-          docker-compose -f examples/docker-compose.yaml down -t 1 --remove-orphans
+          docker compose -f examples/docker-compose.yaml down -t 1 --remove-orphans

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16 as build
+FROM node:16 AS build
 
 RUN apt-get -y update && \
     apt-get -y install default-jdk-headless
@@ -20,7 +20,7 @@ RUN cd /app && \
     chmod +x build/*.js
 
 
-FROM node:16-slim as run
+FROM node:16-slim AS run
 
 COPY --from=build /app/ /app/
 ADD schema.yaml /app/

examples/00-intro.yaml

@@ -15,7 +15,6 @@ tests:
           FOO: bar
         run: |
           [ "${FOO}" == "bar" ]
-        repeat: { retries: 3, interval: '1s' }
       - exec: node1
         if: success()
         run: echo "This will be run!"
@@ -69,3 +68,21 @@ tests:
         expect:
           - step.stdout != "2"
           - step.stdout == "3"
+
+  repeat:
+    name: Repeat test
+    steps:
+      - exec: node1
+        run: rm -f repeat-test-file
+      - exec: node1
+        repeat: { retries: 2, interval: '1s' }
+        run: |
+          if [ ! -f repeat-test-file ]; then
+            touch repeat-test-file
+          else
+            echo -n 'Repeated successfully'
+          fi
+        expect:
+          - step.stdout == "Repeated successfully"
+      - exec: node1
+        run: rm -f repeat-test-file

examples/01-fails.yaml

@@ -34,3 +34,11 @@ tests:
     steps:
       - exec: node2
         run: /bin/true
+
+  fail-expressions:
+    name: Test thrown exception in expressions
+    steps:
+      - exec: node1
+        env:
+          FOO: ${{ throw("Intentional Failure") }}
+        run: /bin/true

schema.yaml

@@ -11,7 +11,7 @@ additionalProperties: false
 required: []
 properties:
   env:  { "$ref": "#/$defs/env" }
-  name: { type: string }
+  name: { type: string, expression: InterpolatedText }
   tests:
     type: object
     additionalProperties:
@@ -22,7 +22,7 @@ properties:
       required: []
       properties:
         env:  { "$ref": "#/$defs/env" }
-        name: { type: string }
+        name: { type: string, expression: InterpolatedText }
         depends:
           oneOf:
             - type: string
@@ -44,7 +44,7 @@ properties:
                 oneOf:
                   - { type: string, expression: Expression }
                   - { type: array, items: { type: string, expression: Expression } }
-              name: { type: string }
+              name: { type: string, expression: InterpolatedText }
               if: { type: string, expression: Expression, default: "success()" }
               index: { type: integer }
               run: