fix

Author: meisterT

.github/workflows/integration.yml

@@ -62,7 +62,13 @@ jobs:
               )
               curl --fail -X POST -n -N -F zip=@${i}.zip http://localhost/domjudge/api/contests/demo/problems
           done
-      - name: Preparing curl cookiejar
+      - name: Monitor judgehost log and stop once all submissions are judged
+        run: |
+          tail -f /opt/domjudge/judgehost/log/judge*-0.log | while read line; do
+            echo "$line"
+            grep "No submissions in queue" /opt/domjudge/judgehost/log/judge*-0.log && break
+          done
+      - name: Verifying submissions
         shell: bash
         run: |
           export CURLOPTS="--fail -sq -m 30 -b /tmp/cookiejar"
@@ -76,6 +82,7 @@ jobs:
           NUMNOTVERIFIED=$(curl $CURLOPTS "http://localhost/domjudge/jury/judging-verifier" | grep "submissions checked"     | sed -r 's/^.* ([0-9]+) submissions checked.*$/\1/')
           NUMVERIFIED=$(   curl $CURLOPTS "http://localhost/domjudge/jury/judging-verifier" | grep "submissions not checked" | sed -r 's/^.* ([0-9]+) submissions not checked.*$/\1/')
           NUMNOMAGIC=$(    curl $CURLOPTS "http://localhost/domjudge/jury/judging-verifier" | grep "without magic string"    | sed -r 's/^.* ([0-9]+) without magic string.*$/\1/')
+          NUMSUBS=$(curl --fail http://admin:password@localhost/domjudge/api/contests/1/submissions | python3 -mjson.tool | grep -c '"id":')
           # We expect
           # - two submissions with ambiguous outcome,
           # - one submissions submitted through the submit client, and thus the magic string ignored,
@@ -87,9 +94,3 @@ jobs:
             curl $CURLOPTS "http://localhost/domjudge/jury/judging-verifier?verify_multiple=1" | w3m -dump -T text/html
             exit 1
           fi
-      - name: Monitor judgehost log and stop once all submissions are judged
-        run: |
-          tail -f /opt/domjudge/judgehost/log/judge*-0.log | while read line; do
-            echo "$line"
-            grep "No submissions in queue" /opt/domjudge/judgehost/log/judge*-0.log && break
-          done