ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-21 17:56:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Rhizome protocol "ManyFiles" test

Browse Source 
Increase the timeout from 30 to 240 seconds.  Reduce debug logging.  Fix
bundle authors.
This commit is contained in:
Andrew Bettison 2018-03-27 15:45:37 +10:30
parent b822378c37
commit 1936015ac7
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/rhizomeprotocol
View File

@ -863,18 +863,26 @@ teardown_SimulatedRadio2() {
doc_ManyFiles="Synchronise many small files, with some files in common" doc_ManyFiles="Synchronise many small files, with some files in common"
setup_ManyFiles() { setup_ManyFiles() {
setup_servald setup_servald
configure_servald_server() {
add_servald_interface
executeOk_servald config \
set log.console.level debug \
set log.console.show_pid on \
set log.console.show_time on \
set debug.rhizome on \
set debug.rhizome_sync_keys on
}
foreach_instance +A +B +C +D create_single_identity foreach_instance +A +B +C +D create_single_identity
bundlesA=() bundlesA=()
bundlesB=() bundlesB=()
bundlesC=() bundlesC=()
bundlesD=() bundlesD=()
for i in {1..10}
for i in `seq 1 10`
do do
tfw_log "Adding common file-$i" tfw_log "Adding common file-$i"
tfw_nolog set_instance +A tfw_nolog set_instance +A
create_file file-$i 100 create_file file-$i 100
tfw_nolog executeOk_servald rhizome add file "${!sidvar}" file-$i file-$i.manifest tfw_nolog executeOk_servald rhizome add file '' file-$i file-$i.manifest
tfw_nolog set_instance +B tfw_nolog set_instance +B
tfw_nolog executeOk_servald rhizome import bundle file-$i file-$i.manifest tfw_nolog executeOk_servald rhizome import bundle file-$i file-$i.manifest
tfw_nolog set_instance +C tfw_nolog set_instance +C
@ -886,10 +894,11 @@ setup_ManyFiles() {
do do
eval "bundles$i=()" eval "bundles$i=()"
set_instance +$i set_instance +$i
for j in `seq 1 10` for j in {1..10}
do do
tfw_log "Adding file$i-$j" tfw_log "Adding file$i-$j"
create_file file$i-$j $(( $j * 500 )) create_file file$i-$j $(( $j * 500 ))
sidvar=SID${i}1
tfw_nolog executeOk_servald rhizome add file "${!sidvar}" file$i-$j file$i-$j.manifest tfw_nolog executeOk_servald rhizome add file "${!sidvar}" file$i-$j file$i-$j.manifest
tfw_nolog extract_stdout_manifestid BID tfw_nolog extract_stdout_manifestid BID
tfw_nolog extract_stdout_version VERSION tfw_nolog extract_stdout_version VERSION
@ -899,9 +908,8 @@ setup_ManyFiles() {
start_servald_instances +A +B +C +D start_servald_instances +A +B +C +D
} }
test_ManyFiles() { test_ManyFiles() {
wait_until --timeout=30 bundle_received_by \ wait_until --timeout=240 bundle_received_by \
${bundlesB[*]} ${bundlesC[*]} ${bundlesD[*]} +A \ ${bundlesB[*]} ${bundlesC[*]} ${bundlesD[*]} +A \
${bundlesA[*]} ${bundlesC[*]} ${bundlesD[*]} +B \ ${bundlesA[*]} ${bundlesC[*]} ${bundlesD[*]} +B \
${bundlesA[*]} ${bundlesB[*]} ${bundlesD[*]} +C \ ${bundlesA[*]} ${bundlesB[*]} ${bundlesD[*]} +C \
@ -909,4 +917,3 @@ test_ManyFiles() {
} }
runTests "$@" runTests "$@"