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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
integration
Commits
69a62d16
Commit
69a62d16
authored
Sep 14, 2022
by
Jonah Husson
Browse files
Options
Downloads
Patches
Plain Diff
Uncomment backup test & update goldoutput
parent
ad290395
No related branches found
No related tags found
2 merge requests
!68
Master merge
,
!35
Uncomment backup test & update goldoutput
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
basice2e/clients.goldoutput/client120.txt
+20
-8
20 additions, 8 deletions
basice2e/clients.goldoutput/client120.txt
basice2e/clients.goldoutput/client121.txt
+21
-9
21 additions, 9 deletions
basice2e/clients.goldoutput/client121.txt
basice2e/run.sh
+31
-31
31 additions, 31 deletions
basice2e/run.sh
with
72 additions
and
48 deletions
basice2e/clients.goldoutput/client120.txt
+
20
−
8
View file @
69a62d16
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client120 to myself, without E2E Encryption
Message received: Hello from Client120 to myself, without E2E Encryption
Message received: Hello from Client120 to myself, without E2E Encryption
Received 1
Authentication channel request from: k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D
Received 0
Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption
Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption
Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption
Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption
Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Received 5
Received 0
Received 0
Received 1
Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption after 121 restoring backup
Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption after 121 restoring backup
Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption after 121 restoring backup
Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption after 121 restoring backup
Sending to k73pjXGLcW/9QEWA9qnQZzXXOrMda8o7uT408EXj0Q0D: Hello from Client120, with E2E Encryption after 121 restoring backup
Message received: Hello from Client121, with E2E Encryption after 121 restoring backup
Message received: Hello from Client121, with E2E Encryption after 121 restoring backup
Message received: Hello from Client121, with E2E Encryption after 121 restoring backup
Message received: Hello from Client121, with E2E Encryption after 121 restoring backup
Message received: Hello from Client121, with E2E Encryption after 121 restoring backup
Received 5
Received 5
Sent: Hello from Client120 to myself, without E2E Encryption
Sent: Hello from Client120, with E2E Encryption
Sent: Hello from Client120, with E2E Encryption
Sent: Hello from Client120, with E2E Encryption
Sent: Hello from Client120, with E2E Encryption
Sent: Hello from Client120, with E2E Encryption
This diff is collapsed.
Click to expand it.
basice2e/clients.goldoutput/client121.txt
+
21
−
9
View file @
69a62d16
Adding
WARNING: unsafe channel creation enabled
Backup update received.
Adding authenticated channel for: zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD
Backup update received.
Received 0
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
Received 5
Backup update received.
Backup update received.
Received 0
Received 0
Received 0
Received 0
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption after 121 restoring backup
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption after 121 restoring backup
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption after 121 restoring backup
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption after 121 restoring backup
Sending to zsNK6j02Yaf2r0dFG2URHwJYv1KAp8IG0PUf+KvihEoD: Hello from Client121, with E2E Encryption after 121 restoring backup
Message received: Hello from Client120, with E2E Encryption after 121 restoring backup
Message received: Hello from Client120, with E2E Encryption after 121 restoring backup
Message received: Hello from Client120, with E2E Encryption after 121 restoring backup
Message received: Hello from Client120, with E2E Encryption after 121 restoring backup
Message received: Hello from Client120, with E2E Encryption after 121 restoring backup
Received 5
Received 5
Sent: Hello from Client121, with E2E Encryption
Sent: Hello from Client121, with E2E Encryption
Sent: Hello from Client121, with E2E Encryption
Sent: Hello from Client121, with E2E Encryption
Sent: Hello from Client121, with E2E Encryption
WARNING: unsafe channel creation enabled
This diff is collapsed.
Click to expand it.
basice2e/run.sh
+
31
−
31
View file @
69a62d16
...
@@ -584,37 +584,37 @@ echo "$CLIENTCMD -- $PIDVAL"
...
@@ -584,37 +584,37 @@ echo "$CLIENTCMD -- $PIDVAL"
echo
"FIXME: The above exits uncleanly, but a backup file is created. The rest of the test fails...It should be FIXED!"
echo
"FIXME: The above exits uncleanly, but a backup file is created. The rest of the test fails...It should be FIXED!"
wait
$PIDVAL
wait
$PIDVAL
#
rm -fr blob121
rm
-fr
blob121
#
CLIENTCMD="timeout 60s ../bin/client $CLIENTBACKUPOPTS -l $CLIENTOUT/client121.log -s blob121 --force-legacy --backupIn $CLIENTOUT/client121A.backup --backupPass hello --backupJsonOut $CLIENTOUT/client121B.backup.json --backupIdList $CLIENTOUT/client121Partners.json --sendCount 0 --receiveCount 0"
CLIENTCMD
=
"timeout 60s ../bin/client
$CLIENTBACKUPOPTS
-l
$CLIENTOUT
/client121.log -s blob121 --force-legacy --backupIn
$CLIENTOUT
/client121A.backup --backupPass hello --backupJsonOut
$CLIENTOUT
/client121B.backup.json --backupIdList
$CLIENTOUT
/client121Partners.json --sendCount 0 --receiveCount 0"
#
eval $CLIENTCMD >> $CLIENTOUT/client121.txt &
eval
$CLIENTCMD
>>
$CLIENTOUT
/client121.txt &
#
PIDVAL=$!
PIDVAL
=
$!
#
echo "$CLIENTCMD -- $PIDVAL"
echo
"
$CLIENTCMD
--
$PIDVAL
"
#
wait $PIDVAL
wait
$PIDVAL
#
CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client121.log -s blob121 --force-legacy --batchadd $CLIENTOUT/client121Partners.json --unsafe-channel-creation"
CLIENTCMD
=
"timeout 240s ../bin/client ud
$CLIENTUDOPTS
-l
$CLIENTOUT
/client121.log -s blob121 --force-legacy --batchadd
$CLIENTOUT
/client121Partners.json --unsafe-channel-creation"
#
eval $CLIENTCMD >> $CLIENTOUT/client121.txt &
eval
$CLIENTCMD
>>
$CLIENTOUT
/client121.txt &
#
PIDVAL=$!
PIDVAL
=
$!
#
echo "$CLIENTCMD -- $PIDVAL"
echo
"
$CLIENTCMD
--
$PIDVAL
"
#
CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client120.log -s blob120 --force-legacy --destfile $CLIENTOUT/client121-contact.bin --sendCount 0 --receiveCount 0 --unsafe-channel-creation"
CLIENTCMD
=
"timeout 360s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client120.log -s blob120 --force-legacy --destfile
$CLIENTOUT
/client121-contact.bin --sendCount 0 --receiveCount 0 --unsafe-channel-creation"
#
eval $CLIENTCMD >> $CLIENTOUT/client120.txt &
eval
$CLIENTCMD
>>
$CLIENTOUT
/client120.txt &
#
PIDVAL2=$!
PIDVAL2
=
$!
#
echo "$CLIENTCMD -- $PIDVAL2"
echo
"
$CLIENTCMD
--
$PIDVAL2
"
#
wait $PIDVAL
wait
$PIDVAL
#
wait $PIDVAL2
wait
$PIDVAL2
#
# Send messages to each other
# Send messages to each other
#
CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client120.log -s blob120 --force-legacy --destfile $CLIENTOUT/client121-contact.bin --sendCount 5 --receiveCount 5 -m \"Hello from Client120, with E2E Encryption after 121 restoring backup\" --unsafe-channel-creation"
CLIENTCMD
=
"timeout 360s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client120.log -s blob120 --force-legacy --destfile
$CLIENTOUT
/client121-contact.bin --sendCount 5 --receiveCount 5 -m
\"
Hello from Client120, with E2E Encryption after 121 restoring backup
\"
--unsafe-channel-creation"
#
eval $CLIENTCMD >> $CLIENTOUT/client120.txt || true &
eval
$CLIENTCMD
>>
$CLIENTOUT
/client120.txt
||
true
&
#
PIDVAL=$!
PIDVAL
=
$!
#
echo "$CLIENTCMD -- $PIDVAL"
echo
"
$CLIENTCMD
--
$PIDVAL
"
#
CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client121.log -s blob121 --force-legacy --destfile $CLIENTOUT/client120-contact.bin --sendCount 5 --receiveCount 5 -m \"Hello from Client121, with E2E Encryption after 121 restoring backup\" --unsafe-channel-creation"
CLIENTCMD
=
"timeout 360s ../bin/client
$CLIENTOPTS
-l
$CLIENTOUT
/client121.log -s blob121 --force-legacy --destfile
$CLIENTOUT
/client120-contact.bin --sendCount 5 --receiveCount 5 -m
\"
Hello from Client121, with E2E Encryption after 121 restoring backup
\"
--unsafe-channel-creation"
#
eval $CLIENTCMD >> $CLIENTOUT/client121.txt || true &
eval
$CLIENTCMD
>>
$CLIENTOUT
/client121.txt
||
true
&
#
PIDVAL2=$!
PIDVAL2
=
$!
#
echo "$CLIENTCMD -- $PIDVAL"
echo
"
$CLIENTCMD
--
$PIDVAL
"
#
wait $PIDVAL
wait
$PIDVAL
#
wait $PIDVAL2
wait
$PIDVAL2
# TODO: Add test that backs up and restore client 120. To do this, you need to be able to delete old requests
# TODO: Add test that backs up and restore client 120. To do this, you need to be able to delete old requests
...
...
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