From cb382b0ad9b0577c9686e8c7a84fef176cc453c6 Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Sun, 29 Apr 2018 19:25:35 +0000
Subject: [PATCH] Stop sorting client output, as we can control the order now
---
basice2e/clients.goldoutput/client12.out | 4 ++--
basice2e/clients.goldoutput/client23.out | 4 ++--
basice2e/clients.goldoutput/client34.out | 4 ++--
basice2e/clients.goldoutput/client41.out | 4 ++--
basice2e/clients.goldoutput/client5.out | 2 +-
basice2e/run.sh | 8 +++-----
6 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/basice2e/clients.goldoutput/client12.out b/basice2e/clients.goldoutput/client12.out
index a95df9f..3889879 100755
--- a/basice2e/clients.goldoutput/client12.out
+++ b/basice2e/clients.goldoutput/client12.out
@@ -1,4 +1,4 @@
-Message from 31, #general Received: Channel, Hello
-Message from 4, Rick Received: Hello, 1
Sending Message to 2, Jim: Hello, 2
+Message from 31, #general Received: Channel, Hello
Sending Message to 2, Jim: Hello, 2
+Message from 4, Rick Received: Hello, 1
diff --git a/basice2e/clients.goldoutput/client23.out b/basice2e/clients.goldoutput/client23.out
index 8ae4e7c..661b1d2 100755
--- a/basice2e/clients.goldoutput/client23.out
+++ b/basice2e/clients.goldoutput/client23.out
@@ -1,4 +1,4 @@
-Message from 1, David Received: Hello, 2
-Message from 31, #general Received: Channel, Hello
Sending Message to 3, Ben: Hello, 3
+Message from 31, #general Received: Channel, Hello
Sending Message to 3, Ben: Hello, 3
+Message from 1, David Received: Hello, 2
diff --git a/basice2e/clients.goldoutput/client34.out b/basice2e/clients.goldoutput/client34.out
index be205e5..20cd035 100755
--- a/basice2e/clients.goldoutput/client34.out
+++ b/basice2e/clients.goldoutput/client34.out
@@ -1,4 +1,4 @@
-Message from 2, Jim Received: Hello, 3
-Message from 31, #general Received: Channel, Hello
Sending Message to 4, Rick: Hello, 4
+Message from 31, #general Received: Channel, Hello
Sending Message to 4, Rick: Hello, 4
+Message from 2, Jim Received: Hello, 3
diff --git a/basice2e/clients.goldoutput/client41.out b/basice2e/clients.goldoutput/client41.out
index cbf2212..0a3f6f1 100755
--- a/basice2e/clients.goldoutput/client41.out
+++ b/basice2e/clients.goldoutput/client41.out
@@ -1,4 +1,4 @@
-Message from 31, #general Received: Channel, Hello
-Message from 3, Ben Received: Hello, 4
Sending Message to 1, David: Hello, 1
+Message from 31, #general Received: Channel, Hello
Sending Message to 1, David: Hello, 1
+Message from 3, Ben Received: Hello, 4
diff --git a/basice2e/clients.goldoutput/client5.out b/basice2e/clients.goldoutput/client5.out
index 7757704..1f38da5 100644
--- a/basice2e/clients.goldoutput/client5.out
+++ b/basice2e/clients.goldoutput/client5.out
@@ -1,2 +1,2 @@
-Message from 31, #general Received: Channel, Hello
Sending Message to 31, #general: Channel, Hello
+Message from 31, #general Received: Channel, Hello
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 2e89e2c..5877f03 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -93,15 +93,15 @@ runclients() {
CHANNELCMD="../bin/client channelbot -v -i 31 --nick \"#general\" --numnodes 5 -s $LASTNODE -f blobchannel --noratchet"
eval $CHANNELCMD >> $CHANNELOUT 2>&1 &
PIDVAL=$!
-echo "$CHANNELCMD -- $PIDVAL"
echo $PIDVAL >> results/serverpids
+echo "$CHANNELCMD -- $PIDVAL"
# Start a dummy client
DUMMYCMD="../bin/client -i 35 -d 35 -s $LASTNODE --numnodes 5 -m \"dummy\" --nick \"dummy\" --dummyfrequency 0.5 --noratchet -f blobdummy"
eval $DUMMYCMD >> $DUMMYOUT 2>&1 &
PIDVAL=$!
-echo "$DUMMYCMD -- $PIDVAL"
echo $PIDVAL >> results/serverpids
+echo "$DUMMYCMD -- $PIDVAL"
# Send a channel message that all clients will receive
CLIENTCMD="timeout 60s ../bin/client -f blob5 --numnodes 5 -s $LASTNODE -i 5 -d 31 -m \"Channel, Hello\" --nick Spencer --noratchet"
@@ -121,9 +121,7 @@ runclients
for F in $(find results/clients -type f)
do
cat $F | grep -v "[Rr]atcheting" > $F.tmp
- # Sort the messages, as we don't care if they arrive out of order
- sort $F.tmp > $F
- rm $F.tmp
+ mv $F.tmp $F
done
--
GitLab