From d8c62a9061e247bc1ed98f49bf47c8a414c4ab33 Mon Sep 17 00:00:00 2001
From: William Carter <wjcarter3@gmail.com>
Date: Mon, 19 Mar 2018 16:23:42 +0000
Subject: [PATCH] =?UTF-8?q?Revert=20"Modified=20integration=20test=20to=20?=
=?UTF-8?q?use=20nicknames.=20This=20inserts=20GetContactList=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 21db36bc7013d38f70bc15b266290ad8e57da76d
---
basice2e/clients.goldoutput/client12.out | 8 ++++----
basice2e/clients.goldoutput/client23.out | 8 ++++----
basice2e/clients.goldoutput/client34.out | 8 ++++----
basice2e/clients.goldoutput/client41.out | 8 ++++----
basice2e/run.sh | 11 +++--------
5 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/basice2e/clients.goldoutput/client12.out b/basice2e/clients.goldoutput/client12.out
index 59c38dc..f468d1b 100644
--- a/basice2e/clients.goldoutput/client12.out
+++ b/basice2e/clients.goldoutput/client12.out
@@ -1,4 +1,4 @@
-Sending Message to 2, Jim: Hello, 2
-Message from 4, Rick Received: Hello, 1
-Sending Message to 2, Jim: Hello, 2
-Message from 4, Rick Received: Hello, 1
+Sending Message to 2: Hello, 2
+Message from 4 Received: Hello, 1
+Sending Message to 2: Hello, 2
+Message from 4 Received: Hello, 1
diff --git a/basice2e/clients.goldoutput/client23.out b/basice2e/clients.goldoutput/client23.out
index f978dc8..05ffbe6 100644
--- a/basice2e/clients.goldoutput/client23.out
+++ b/basice2e/clients.goldoutput/client23.out
@@ -1,4 +1,4 @@
-Sending Message to 3, Ben: Hello, 3
-Message from 1, David Received: Hello, 2
-Sending Message to 3, Ben: Hello, 3
-Message from 1, David Received: Hello, 2
+Sending Message to 3: Hello, 3
+Message from 1 Received: Hello, 2
+Sending Message to 3: Hello, 3
+Message from 1 Received: Hello, 2
diff --git a/basice2e/clients.goldoutput/client34.out b/basice2e/clients.goldoutput/client34.out
index 535a51f..00965b6 100644
--- a/basice2e/clients.goldoutput/client34.out
+++ b/basice2e/clients.goldoutput/client34.out
@@ -1,4 +1,4 @@
-Sending Message to 4, Rick: Hello, 4
-Message from 2, Jim Received: Hello, 3
-Sending Message to 4, Rick: Hello, 4
-Message from 2, Jim Received: Hello, 3
+Sending Message to 4: Hello, 4
+Message from 2 Received: Hello, 3
+Sending Message to 4: Hello, 4
+Message from 2 Received: Hello, 3
diff --git a/basice2e/clients.goldoutput/client41.out b/basice2e/clients.goldoutput/client41.out
index df9a4f6..a249345 100644
--- a/basice2e/clients.goldoutput/client41.out
+++ b/basice2e/clients.goldoutput/client41.out
@@ -1,4 +1,4 @@
-Sending Message to 1, David: Hello, 1
-Message from 3, Ben Received: Hello, 4
-Sending Message to 1, David: Hello, 1
-Message from 3, Ben Received: Hello, 4
+Sending Message to 1: Hello, 1
+Message from 3 Received: Hello, 4
+Sending Message to 1: Hello, 1
+Message from 3 Received: Hello, 4
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 10d5efb..ba12502 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -46,10 +46,7 @@ sleep 20 # FIXME: We should not need this, but the servers don't respond quickly
# enough on boot right now.
LASTNODE="localhost:50004"
-NICK1="David"
-NICK2="Jim"
-NICK3="Ben"
-NICK4="Rick"
+
echo "STARTING CLIENTS..."
CTR=0
@@ -63,8 +60,7 @@ do
for nid in 1
do
nid=$((($cid % 4) + 1))
- NICK=NICK${cid}
- CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\" --nick ${!NICK}"
+ CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\""
eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.out 2>&1 &
RETVAL=$!
eval CLIENTS${CTR}=$RETVAL
@@ -90,8 +86,7 @@ do
for nid in 1
do
nid=$((($cid % 4) + 1))
- NICK=NICK${cid}
- CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\" --nick ${!NICK}"
+ CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\""
eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.out 2>&1 &
RETVAL=$!
eval CLIENTS${CTR}=$RETVAL
--
GitLab