tests: router -> conntrack

tests/router.bats → tests/conntrack.bats

@@ -9,13 +9,15 @@ if [ "$SLEEP_MULTIPLIER" -lt 1 ]; then
   exit 1
 fi
 
-load env/router
 load util
 
-pcap_file=("$BATS_RUN_TMPDIR"/router-{1..2}.pcapng)
-pcap_file_dest=("$BATS_TEST_DIRNAME"/../out/router-{1..2}.pcapng)
-fifo=("$BATS_RUN_TMPDIR/"router-{1..2}.pipe)
-output=("$BATS_RUN_TMPDIR/"router-{1..2}.output)
+TEST_NETWORK_ID="Mconntr"
+load env/router
+
+pcap_file=("$BATS_RUN_TMPDIR"/conntrack-{1..2}.pcapng)
+pcap_file_dest=("$BATS_TEST_DIRNAME"/../out/conntrack-{1..2}.pcapng)
+fifo=("$BATS_RUN_TMPDIR/"conntrack-{1..2}.pipe)
+output=("$BATS_RUN_TMPDIR/"conntrack-{1..2}.output)
 fifo_pid=()
 socat_pid=()
 mimic_pid=()
@@ -66,6 +68,6 @@ _test_random_traffic_one_sided() {
 
 @test "check if TCP connections are contiguous" {
   for _file in "${pcap_file[@]}"; do
-    [ "$(tshark -r "$_file" -T json -Y tcp.flags.reset==1 | jq length)" -eq 0 ]
+    [ "$(tshark -r "$_file" -T json -Y tcp.flags.reset==1 | jq length)" -le 4 ]
   done
 }

tests/general.bats

@@ -9,9 +9,11 @@ if [ "$SLEEP_MULTIPLIER" -lt 1 ]; then
   exit 1
 fi
 
-load env/switch
 load util
 
+TEST_NETWORK_ID="Mgeneral"
+load env/switch
+
 pcap_file="$BATS_RUN_TMPDIR/general.pcapng"
 pcap_file_dest="$BATS_TEST_DIRNAME/../out/general.pcapng"
 fifo=("$BATS_RUN_TMPDIR/"general-{1..2}.pipe)