fix

Author: meisterT

.github/workflows/integration.yml

@@ -33,33 +33,6 @@ jobs:
         run: cat /proc/cmdline && echo && cat /proc/mounts && echo && ls -al /sys/fs/cgroup && echo && uname -a && echo && stat -fc %T /sys/fs/cgroup && echo && cat /proc/self/cgroup
       - name: Install DOMjudge
         run: .github/jobs/baseinstall.sh all
-      - name: Verifying submissions
-        shell: bash
-        run: |
-          set -x
-          export CURLOPTS="--fail -sq -m 30 -b /tmp/cookiejar"
-          # Make an initial request which will get us a session id, and grab the csrf token from it
-          CSRFTOKEN=$(curl $CURLOPTS -c /tmp/cookiejar "http://localhost/domjudge/login" | sed -n 's/.*_csrf_token.*value="\(.*\)".*/\1/p')
-          # Make a second request with our session + csrf token to actually log in
-          curl $CURLOPTS -c /tmp/cookiejar -F "_csrf_token=$CSRFTOKEN" -F "_username=admin" -F "_password=password" "http://localhost/domjudge/login"
-          # Send a general clarification to later test if we see the event.
-          curl $CURLOPTS -F "sendto=" -F "problem=1-" -F "bodytext=Testing" -F "submit=Send" \
-               "http://localhost/domjudge/jury/clarifications/send" -o /dev/null
-          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 $CURLOPTS http://localhost/domjudge/api/contests/demo/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,
-          # - and all submissions to be judged.
-          if [ $NUMNOTVERIFIED -ne 2 ] || [ $NUMNOMAGIC -ne 1 ] || [ $NUMSUBS -gt $((NUMVERIFIED+NUMNOTVERIFIED)) ]; then
-            echo "verified subs: $NUMVERIFIED, unverified subs: $NUMNOTVERIFIED, total subs: $NUMSUBS"
-            echo "(expected 2 submissions to be unverified, but all to be processed)"
-            echo "Of these $NUMNOMAGIC do not have the EXPECTED_RESULTS string (should be 1)."
-            curl $CURLOPTS "http://localhost/domjudge/jury/judging-verifier?verify_multiple=1" | w3m -dump -T text/html
-            exit 1
-          fi
       - name: Set up chroot
         run: sudo misc-tools/dj_make_chroot -a amd64
       - name: Check nginx
@@ -98,6 +71,7 @@ jobs:
       - name: Verifying submissions
         shell: bash
         run: |
+          set -x
           export CURLOPTS="--fail -sq -m 30 -b /tmp/cookiejar"
           # Make an initial request which will get us a session id, and grab the csrf token from it
           CSRFTOKEN=$(curl $CURLOPTS -c /tmp/cookiejar "http://localhost/domjudge/login" | sed -n 's/.*_csrf_token.*value="\(.*\)".*/\1/p')
@@ -109,7 +83,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 $CURLOPTS http://localhost/domjudge/api/contests/1/submissions | python3 -mjson.tool | grep -c '"id":')
+          NUMSUBS=$(curl $CURLOPTS http://localhost/domjudge/api/contests/demo/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,