New test to demonstrate non-Prune fixed branch bug

Author: neilstephens

.github/workflows/MiniPlex.yml

@@ -77,6 +77,7 @@ jobs:
         build/MiniPlex -T -p 20001 -r 127.0.0.1 -t 50000 &
         build/MiniPlex -P -p 20002 -r 127.0.0.1 -t 50000 &
         build/MiniPlex -P -p 20003 -r 127.0.0.1 -t 50000 -B 127.0.0.1 -b 50001 &
+        build/MiniPlex -T -p 20004 -r 127.0.0.1 -t 50000 -B 127.0.0.1 -b 50001 &
         socat pty,raw,echo=0,link=SerialEndpoint1 pty,raw,echo=0,link=SerialEndpoint2 &
         socat pty,raw,echo=0,link=SerialEndpoint3 pty,raw,echo=0,link=SerialEndpoint4 &
         socat pty,raw,echo=0,link=SerialEndpoint5 pty,raw,echo=0,link=SerialEndpoint6 &
@@ -104,9 +105,14 @@ jobs:
         Test/PruneMode.sh 50000 127.0.0.1 20002
 
     - if: ${{ always() && !contains(matrix.os,'windows') }}
-      name: Test Permanent Branches
+      name: Test Permanent Branches Prune
       run: |
         Test/PermanentBranches.sh 50000 50001 127.0.0.1 20003
+
+    - if: ${{ always() && !contains(matrix.os,'windows') }}
+      name: Test Permanent Branches Trunk
+      run: |
+        Test/PermanentBranchesTrunk.sh 50000 50001 127.0.0.1 20004
         
     - if: ${{ always() && !contains(matrix.os,'windows') }}
       name: Test ProtoConv Delim

Test/PermanentBranchesTrunk.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+#Test MiniPlex permanent branches
+# Same as trunk mode, except the trunk speaks first, to prove the perm branch still gets it
+
+#Usage: <this_script> <MiniPlex trunk port> <MiniPlex perm port> <MiniPlex host> <MiniPlex port>
+
+# Check if host and port are provided
+if [ $# -ne 4 ]; then
+    echo "Error: Please provide trunk-port perm-port host and port arguments"
+    echo "Usage: $0 <MiniPlex trunk port> <MiniPlex perm port> <MiniPlex host> <MiniPlex port>"
+    exit 1
+fi
+
+# Execute ncat commands and capture output
+exec 3< <((sleep 0.5 && echo -n 3 && sleep 2 && echo -n 3 && sleep 0.5) | ncat -u -p $1 $3 $4)
+sleep 0.1
+exec 4< <((sleep 1 && echo -n 4 && sleep 2) | ncat -u -p $2 $3 $4)
+sleep 0.1
+exec 5< <((sleep 1.5 && echo -n 5 && sleep 1.5) | ncat -u $3 $4)
+sleep 0.1
+exec 6< <((sleep 2 && echo -n 6 && sleep 1) | ncat -u $3 $4)
+sleep 0.1
+
+# Read outputs
+OUT3=$(cat <&3)
+OUT4=$(cat <&4)
+OUT5=$(cat <&5)
+OUT6=$(cat <&6)
+
+# Initialize error flag
+ERROR_FOUND=0
+
+# Check OUT3
+if [ "$OUT3" != "456" ]; then
+    echo "Error: OUT3 expected '456', got '$OUT3'"
+    ERROR_FOUND=1
+fi
+
+# Check OUT4
+if [ "$OUT4" != "33" ]; then
+    echo "Error: OUT4 expected '33', got '$OUT4'"
+    ERROR_FOUND=1
+fi
+
+# Check OUT5
+if [ "$OUT5" != "3" ]; then
+    echo "Error: OUT5 expected '3', got '$OUT5'"
+    ERROR_FOUND=1
+fi
+
+# Check OUT6
+if [ "$OUT6" != "3" ]; then
+    echo "Error: OUT6 expected '3', got '$OUT6'"
+    ERROR_FOUND=1
+fi
+
+# Exit with appropriate status
+if [ $ERROR_FOUND -eq 1 ]; then
+    exit 1
+else
+	echo "All tests passed."
+    exit 0
+fi