Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
integration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
integration
Commits
ab3d69d3
Commit
ab3d69d3
authored
5 years ago
by
Rick Carback
Browse files
Options
Downloads
Patches
Plain Diff
Adjust timeouts and remove timestamp line from client output
parent
a2f9b4e6
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
basice2e/run.sh
+21
-25
21 additions, 25 deletions
basice2e/run.sh
with
21 additions
and
25 deletions
basice2e/run.sh
+
21
−
25
View file @
ab3d69d3
...
...
@@ -42,14 +42,13 @@ for SERVERID in $(seq 5 -1 1)
do
IDX
=
$((
$SERVERID
-
1
))
SERVERCMD
=
"../bin/server -v -i
$IDX
--roundBufferTimeout 300s --config server-
$SERVERID
.yaml"
if
[
$SERVERID
-eq
4
]
;
then
sleep
15
# This will force a CDE timeout
fi
$SERVERCMD
>
$SERVERLOGS
/server-
$SERVERID
-console
.txt 2>&1 &
PIDVAL
=
$!
echo
"
$SERVERCMD
--
$PIDVAL
"
done
sleep
15
# Start gateways
for
GWID
in
$(
seq
5
-1
1
)
do
...
...
@@ -60,9 +59,6 @@ do
echo
"
$GATEWAYCMD
--
$PIDVAL
"
done
sleep
180
# Give servers some time to boot
jobs
-p
>
results/serverpids
finish
()
{
...
...
@@ -81,7 +77,7 @@ finish() {
trap
finish EXIT
trap
finish INT
sleep
3
0
# FIXME: We should not need this, but the servers don't respond quickly
sleep
12
0
# FIXME: We should not need this, but the servers don't respond quickly
# enough on boot right now.
runclients
()
{
...
...
@@ -101,7 +97,7 @@ runclients() {
nid
=
$((
((
$cid
+
1
)
%
4
)
+
4
))
eval
NICK
=
\$
{
NICK
${
cid
}
}
# Send a regular message
CLIENTCMD
=
"timeout
6
0s ../bin/client
$CLIENTOPTS
-f blob
$cid
-E email
$cid
@email.com -i
$cid
-d
$nid
-m
\"
Hello,
$nid
\"
"
CLIENTCMD
=
"timeout
3
0s ../bin/client
$CLIENTOPTS
-f blob
$cid
-E email
$cid
@email.com -i
$cid
-d
$nid
-m
\"
Hello,
$nid
\"
"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client
$cid$nid
.txt 2>&1 &
PIDVAL
=
$!
eval
CLIENTS
${
CTR
}
=
$PIDVAL
...
...
@@ -125,17 +121,17 @@ runclients
# Register two users and then do UDB search on each other
echo
"REGISTERING AND SEARCHING WITH PRECANNED USERS..."
CLIENTCMD
=
"timeout
6
0s ../bin/client
$CLIENTOPTS
-f blob9 -E niamh@elixxir.io -i 9 -d 9 -m
\"
Hi
\"
"
CLIENTCMD
=
"timeout
3
0s ../bin/client
$CLIENTOPTS
-f blob9 -E niamh@elixxir.io -i 9 -d 9 -m
\"
Hi
\"
"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client9.txt 2>&1 &
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
CLIENTCMD
=
"timeout
6
0s ../bin/client
$CLIENTOPTS
-f blob18 -E bernardo@elixxir.io -i 18 -d 9 -s
\"
niamh@elixxir.io
\"
--keyParams 3,4,2,1.0,2"
CLIENTCMD
=
"timeout
3
0s ../bin/client
$CLIENTOPTS
-f blob18 -E bernardo@elixxir.io -i 18 -d 9 -s
\"
niamh@elixxir.io
\"
--keyParams 3,4,2,1.0,2"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client18.txt 2>&1 &
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
CLIENTCMD
=
"timeout
6
0s ../bin/client
$CLIENTOPTS
-f blob9 -i 9 -d 18 -s
\"
bernardo@elixxir.io
\"
--keyParams 3,4,2,1.0,2"
CLIENTCMD
=
"timeout
3
0s ../bin/client
$CLIENTOPTS
-f blob9 -i 9 -d 18 -s
\"
bernardo@elixxir.io
\"
--keyParams 3,4,2,1.0,2"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client9.txt 2>&1 &
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
...
...
@@ -157,12 +153,12 @@ wait $PIDVAL || true
# Register non-precanned users
echo
"REGISTERING NEW USERS..."
CLIENTCMD
=
"timeout
6
0s ../bin/client
$CLIENTOPTS
-f blob42 -E rick42@elixxir.io"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client42.txt
2>&1
&
CLIENTCMD
=
"timeout
3
0s ../bin/client
$CLIENTOPTS
-f blob42 -E rick42@elixxir.io
-r FFFF
"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client42.txt &
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
CLIENTCMD
=
"timeout
6
0s ../bin/client
$CLIENTOPTS
-f blob43 -E ben43@elixxir.io"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client43.txt
2>&1
&
CLIENTCMD
=
"timeout
3
0s ../bin/client
$CLIENTOPTS
-f blob43 -E ben43@elixxir.io
-r GGGG
"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client43.txt &
PIDVAL2
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
...
...
@@ -170,12 +166,12 @@ wait $PIDVAL2
# Have each non-precanned user search for each other
echo
"SEARCHING FOR NEW USERS..."
CLIENTCMD
=
"timeout
6
0s ../bin/client
$CLIENTOPTS
-f blob42 -s
\"
ben43@elixxir.io
\"
--keyParams 3,4,2,1.0,2"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client42.txt
2>&1
&
CLIENTCMD
=
"timeout
3
0s ../bin/client
$CLIENTOPTS
-f blob42 -s
\"
ben43@elixxir.io
\"
--keyParams 3,4,2,1.0,2"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client42.txt &
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
CLIENTCMD
=
"timeout
6
0s ../bin/client
$CLIENTOPTS
-f blob43 -s
\"
rick42@elixxir.io
\"
--keyParams 3,4,2,1.0,2"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client43.txt
2>&1
&
CLIENTCMD
=
"timeout
3
0s ../bin/client
$CLIENTOPTS
-f blob43 -s
\"
rick42@elixxir.io
\"
--keyParams 3,4,2,1.0,2"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client43.txt &
PIDVAL2
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
...
...
@@ -190,12 +186,12 @@ BENID=${TMPID%?} # remove ! from end
# Non-precanned user messaging
echo
"SENDING E2E MESSAGES TO NEW USERS..."
CLIENTCMD
=
"timeout
18
0s ../bin/client
$CLIENTOPTS
-c 1 -w 1 --dest64
$BENID
-s
\"
ben43@elixxir.io
\"
-f blob42 -m
\"
Hello from Rick42, with E2E Encryption
\"
--end2end"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client42.txt
2>&1
||
true
&
CLIENTCMD
=
"timeout
3
0s ../bin/client
$CLIENTOPTS
-c 1 -w 1 --dest64
$BENID
-s
\"
ben43@elixxir.io
\"
-f blob42 -m
\"
Hello from Rick42, with E2E Encryption
\"
--end2end"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client42.txt
||
true
&
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
CLIENTCMD
=
"timeout
18
0s ../bin/client
$CLIENTOPTS
-c 1 -w 1 --dest64
$RICKID
-s
\"
rick42@elixxir.io
\"
-f blob43 -m
\"
Hello from Ben43, with E2E Encryption
\"
--end2end"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client43.txt
2>&1
||
true
&
CLIENTCMD
=
"timeout
3
0s ../bin/client
$CLIENTOPTS
-c 1 -w 1 --dest64
$RICKID
-s
\"
rick42@elixxir.io
\"
-f blob43 -m
\"
Hello from Ben43, with E2E Encryption
\"
--end2end"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client43.txt
||
true
&
PIDVAL2
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
wait
$PIDVAL
...
...
@@ -217,8 +213,8 @@ head -10 $CLIENTCLEAN/client18_rekey.txt | strings | grep -v "\.\.\." > $CLIENTC
rm
$CLIENTCLEAN
/client9_rekey.txt
$CLIENTCLEAN
/client18_rekey.txt
||
true
strings
$CLIENTCLEAN
/client42.txt |
grep
-v
"
\.\.\.
"
>
$CLIENTCLEAN
/client42-clean.txt
||
true
strings
$CLIENTCLEAN
/client43.txt |
grep
-v
"
\.\.\.
"
>
$CLIENTCLEAN
/client43-clean.txt
||
true
strings
$CLIENTCLEAN
/client42.txt |
grep
-v
"Timestamp"
|
grep
-v
"
\.\.\.
"
>
$CLIENTCLEAN
/client42-clean.txt
||
true
strings
$CLIENTCLEAN
/client43.txt |
grep
-v
"Timestamp"
|
grep
-v
"
\.\.\.
"
>
$CLIENTCLEAN
/client43-clean.txt
||
true
mv
$CLIENTCLEAN
/client42-clean.txt
$CLIENTCLEAN
/client42.txt
mv
$CLIENTCLEAN
/client43-clean.txt
$CLIENTCLEAN
/client43.txt
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment