Skip to content
Snippets Groups Projects
Commit fffffbdb authored by Jake Taylor's avatar Jake Taylor :lips:
Browse files

Merge branch 'xx-4174/backup' into 'release' 

Uncomment backup test & update goldoutput

See merge request !35
parents 4015404f a36f81e0
No related branches found
No related tags found
2 merge requests!68Master merge,!35Uncomment backup test & update goldoutput
Show whitespace changes
Inline Side-by-side
basice2e/clients.goldoutput/client120.txt
+ 13
− 0
View file @ fffffbdb
Message received: Hello from Client120 to myself, without 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 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 0
Received 0
Received 1
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
Sent: Hello from Client120, with E2E Encryption after 121 restoring backup
Sent: Hello from Client120, with E2E Encryption after 121 restoring backup
Sent: Hello from Client120, with E2E Encryption after 121 restoring backup
Sent: Hello from Client120, with E2E Encryption after 121 restoring backup
Sent: Hello from Client120, with E2E Encryption after 121 restoring backup
basice2e/clients.goldoutput/client121.txt
+ 12
− 0
View file @ fffffbdb
......@@ -6,12 +6,24 @@ 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 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 0
Received 0
Received 0
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
Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
WARNING: unsafe channel creation enabled
basice2e/run.sh
+ 31
− 31
View file @ fffffbdb
......@@ -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!"
wait $PIDVAL
# 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"
# eval $CLIENTCMD >> $CLIENTOUT/client121.txt &
# PIDVAL=$!
# echo "$CLIENTCMD -- $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"
# eval $CLIENTCMD >> $CLIENTOUT/client121.txt &
# 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"
# eval $CLIENTCMD >> $CLIENTOUT/client120.txt &
# PIDVAL2=$!
# echo "$CLIENTCMD -- $PIDVAL2"
# wait $PIDVAL
# wait $PIDVAL2
# # 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"
# eval $CLIENTCMD >> $CLIENTOUT/client120.txt || true &
# 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"
# eval $CLIENTCMD >> $CLIENTOUT/client121.txt || true &
# PIDVAL2=$!
# echo "$CLIENTCMD -- $PIDVAL"
# wait $PIDVAL
# wait $PIDVAL2
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"
eval $CLIENTCMD >> $CLIENTOUT/client121.txt &
PIDVAL=$!
echo "$CLIENTCMD -- $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"
eval $CLIENTCMD >> $CLIENTOUT/client121.txt &
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"
eval $CLIENTCMD >> $CLIENTOUT/client120.txt &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL
wait $PIDVAL2
# 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"
eval $CLIENTCMD >> $CLIENTOUT/client120.txt || true &
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"
eval $CLIENTCMD >> $CLIENTOUT/client121.txt || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL
wait $PIDVAL2
# TODO: Add test that backs up and restore client 120. To do this, you need to be able to delete old requests
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment