From 2eb4a50d4d03d12c7feceaa8135804e1910d88f8 Mon Sep 17 00:00:00 2001
From: Zwelf <zwelf@strct.cc>
Date: Sun, 21 Apr 2024 23:24:16 +0200
Subject: [PATCH] Add check for correct finish time in integration_test.sh

ALso exclude coverage.map from twmap-checker due to using tele
checkpoints without matching tele checkpoints to test physics.

Disable exact checks on valgrind. Only require at least one finish.
---
 .github/workflows/style.yml |   2 +-
 data/maps/coverage.map      | Bin 2319 -> 3791 bytes
 scripts/integration_test.sh |  33 ++++++++++++++++++++-------------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index cdd21ec04..65faae305 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -77,7 +77,7 @@ jobs:
       run: scripts/check_unused_header_files.py
     - name: Check maps
       run: |
-        findings=$(find data -type f -name '*.map' -print0 | xargs -0 ~/.cargo/bin/twmap-check-ddnet 2>&1 | \
+        findings=$(find data -type f -name '*.map' ! -wholename 'data/maps/coverage.map' -print0 | xargs -0 ~/.cargo/bin/twmap-check-ddnet 2>&1 | \
           grep -v -E "\"data/maps/(ctf|dm).*\.map\": Time cps are missing on the map" | \
           grep -v -E "\"data/themes/.*\.map\": Time cps are missing on the map" | \
           grep -v -E "\"data/maps/ctf4\.map\": Map - In Image at index 3 -> Image 'jungle_doodads_old' is not a valid external image for DDNet06" | \
diff --git a/data/maps/coverage.map b/data/maps/coverage.map
index 308cde79b91f063f26bbec1c9041eeccc8b917ad..af7113ab9f9b7b6359351dfc3ae7f6b2946b3499 100644
GIT binary patch
delta 2542
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
Z+F$+-CSuXC^@ILly8&QPVmecz`afoOdt3kj

delta 1205
zcmYk4doWyg6vuye_wHKj{fbrgfiyuPUDXa*S>iDWvmt1xR@7`#5)5m#7`CesHZzG=
zZ^x*t$2LMbXfe@DBSH|5A)X<ddb5_Qcge~yw!bU?<jj2TIp@yzJbv^04bt-st-Rbr
z+))64ngYNM44?xB5N*gL5dbZ;(28TJ0W&g02ZBHj)d1*1Pk^XltY0W{^S%Y;m5@#d
zZsw3PkT^&JtSW#!flNT?u+kMGfDobH2x_z-#Q?KIPGDh(4K{?LX7~ge{0%Drz}JKv
z#aJoA#H0uX>qM?1WNa8Q!e$W^J5R7d2-tN(Fhayy2%gwgB8!EWEv_!U%7g|WB$%r|
zFzh_>IMzdC(eMK<E^dxyZtf~@A+Es>j!B89vC}9EPUE4bI+`EUlQ045hETBv)EY}f
z&tdu`6wx}$q$C>Lr-{TwNZ1(37CT9f7Z>rU?QH$*^5l=lvM*2V3oSmWa2gt2&Yj%L
zs{ZN6W1bEbytrv?v((C(ryG2ValK=<(M#(CQ~73MK%Mo0P`(+~mLo~OL7$6kfA5*?
zIX;@^jP>8XyCp`=8GQL>%(O(Qe(`pHXjO1aC!e^p?PPtBF5i^Pntis!o`+{;8#jCT
z^q~%gfVv#D?X0oGPK!Ioonbqqg_M;ARz2f>TgHfIsPsxB<`>kDyDKg(W=JYU2{UQ5
zt=nUze=nH*Q}zXYZC_tvCF{12a$0Z=TJmcvP;Fhj0KbLYF#Zd^f1AFw5g~{6iy^y{
zLZLNExcL@&Pr;-uK`#kYQ;we;aL@s43Sg%;WQxn3XRrB(lX5}k<7<(60A%vUcW3p8
zw>iKD*Sd|%3;;`;*hcC4hWeJ7m!)~bMj7d)vP$B?TL8e>Te)EbVj9<#p@smYK5vbv
zuHi)BFJwo)r6AhlJ;Vd<_&k)&*b8;maC9)~b04vbF)=Dl2IPN}@h*GwRYy;@Rt0)o
zkp5KZn%tk7$ujniN*VrWQcX6`w#*54Jxq6D`rbdqkosEg86@;I7K`eB_0*z=FAsT0
zj&UBPuGSx1>EFo8YpE?)d-#;ZMmP=^Dwk<XVm-Qj^!CW5iF<jj4^rkQc9RdMRKuLe
zm9Vu~36=Bc?z%I1ZS>Cm`!++eY+d{07@6mt>O2!Q5|~2BNVgt@D;2F#Z?cVZLUpKy
zpFTmFi5=$49Wz0uv-Zhqw|g<Pkv|udC6Z|khTq+$l;~(X{M8>BOYGH>%gws}kRJdJ
zNW9i%g;%^jXv+$r3Ra&*Pc_xNsbaoPscks(bNZV@m8^L@?eZ0E)u@6m`d-=K;rmh$
z>RPO*uluX_M0ap*Fsc8Np-?_PS#-bT0ym?}c3d=LqB&zBt6blepZ&dP|5Xdar8^`j
zX-~=*_H4N>eLdK~Tbvd8h3f7me%^TyvEtAlH!}W*gD~(jE?@j*b;15h*F%P|@GISj
r!5{jb&!xHd&iywX>liYaI1$PTXcWC3&}p@OF!7Gs{f>|%IK}%P{aovG

diff --git a/scripts/integration_test.sh b/scripts/integration_test.sh
index 09895662d..9efde538b 100755
--- a/scripts/integration_test.sh
+++ b/scripts/integration_test.sh
@@ -167,7 +167,7 @@ function wait_for_fifo() {
 			print_results
 			exit 1
 		fi
-		sleep 1
+		sleep 0.1
 	done
 }
 
@@ -175,10 +175,10 @@ function wait_for_launch() {
 	local fifo="$1"
 	local baseDuration="$2"
 	if [ "$arg_valgrind_memcheck" == "1" ]; then
-		wait_for_fifo "$fifo" $((40 * baseDuration))
+		wait_for_fifo "$fifo" $((400 * baseDuration))
 		sleep $((8 * baseDuration))
 	else
-		wait_for_fifo "$fifo" $((10 * baseDuration))
+		wait_for_fifo "$fifo" $((100 * baseDuration))
 		sleep "$baseDuration"
 	fi
 }
@@ -203,12 +203,11 @@ $tool ../DDNet \
 	$client_args
 	connect localhost:$port" > stdout_client1.txt 2> stderr_client1.txt || fail client1 "$?" &
 
-wait_for_launch client1.fifo 5
+wait_for_launch client1.fifo 3
 
 echo "[*] Start demo recording"
 echo "record server" > server.fifo
 echo "record client1" > client1.fifo
-sleep 1
 
 echo "[*] Launch client 2"
 $tool ../DDNet \
@@ -220,6 +219,9 @@ $tool ../DDNet \
 
 wait_for_launch client2.fifo 5
 
+# wait for tees to finish
+sleep 15
+
 echo "[*] Test chat and chat commands"
 echo "say hello world" > client1.fifo
 echo "rcon_auth rcon" > client1.fifo
@@ -313,20 +315,25 @@ then
 fi
 
 ranks="$(sqlite3 ddnet-server.sqlite < <(echo "select * from record_race;"))"
-num_ranks="$(echo "$ranks" | wc -l | xargs)"
+rank_time="$(echo "$ranks" | awk -F '|' '{ print "player:", $2, "time:", $4, "cps:", $6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28 }')"
+expected_times="\
+player: client2 time: 1020.98 cps: 0.02 0.1 0.2 0.26 0.32 600.36 600.42 600.46 600.5 1020.54 1020.58 1020.6 1020.64 1020.66 1020.7 1020.72 1020.76 1020.78 1020.8 1020.84 1020.86 1020.88 1020.9
+player: client2 time: 1020.38 cps: 1021.34 0.02 0.04 0.04 0.06 600.08 600.1 600.12 600.12 1020.14 1020.16 1020.18 1020.2 1020.2 1020.22 1020.24 1020.26 1020.26 1020.28 1020.3 1020.3 1020.32 1020.34
+player: client1 time: 6248.56 cps: 0.42 0.5 0.0 0.66 0.92 0.02 300.18 300.46 300.76 300.88 300.98 301.02 301.04 301.06 301.08 301.18 301.38 301.66 307.34 308.08 308.1 308.14 308.44
+player: client1 time: 168300.5 cps: 0.02 0.06 0.12 15300.14 15300.18 30600.2 30600.22 45900.24 45900.26 61200.28 61200.3 76500.32 76500.34 91800.36 91800.36 107100.38 107100.4 122400.42 122400.42 137700.44 137700.45 137700.45 153000.48
+player: client2 time: 302.02 cps: 0.42 0.5 0.0 0.66 0.92 0.02 300.18 300.46 300.76 300.88 300.98 301.16 301.24 301.28 301.3 301.86 301.96 0.0 0.0 0.0 0.0 0.0 0.0"
+
+# require at least one rank in all cases. Exact finishes only with valgrind disabled
 if [ "$ranks" == "" ]
 then
 	touch fail_ranks.txt
 	echo "[-] Error: no ranks found in database"
-elif [ "$num_ranks" != "1" ]
+elif [ "$arg_valgrind_memcheck" != "1" ] && [ "$rank_time" != "$expected_times" ]
 then
 	touch fail_ranks.txt
-	echo "[-] Error: expected 1 rank got $num_ranks"
-elif ! echo "$ranks" | grep -q client1
-then
-	touch fail_ranks.txt
-	echo "[-] Error: expected a rank from client1 instead got:"
-	echo "  $ranks"
+	echo "[-] Error: unexpected finish time"
+	echo "  expected: $expected_times"
+	echo "  got: $rank_time"
 fi
 
 for logfile in client1.log client2.log server.log