ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-21 06:03:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make directory service test fail if the dna helper doesn't start

Browse Source
This commit is contained in:
Jeremy Lakeman 2012-12-20 16:50:50 +10:30
parent 38589f293c
commit 50b216da96
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/directory_service
View File

@ -41,7 +41,6 @@ is_published() {
} }
sent_directory_request() { sent_directory_request() {
tfw_log "grep \"Sending directory registration\" $1"
grep "Sending directory registration" $1 || return 1 grep "Sending directory registration" $1 || return 1
return 0 return 0
} }
@ -62,6 +61,7 @@ setup_publish() {
set debug.dnahelper on set debug.dnahelper on
foreach_instance +B +C +D executeOk_servald config set directory.service $SIDA foreach_instance +B +C +D executeOk_servald config set directory.service $SIDA
start_servald_instances +A +B +C +D start_servald_instances +A +B +C +D
wait_until grep "DNAHELPER got STARTED ACK" $LOGA
} }
doc_publish="Publish and retrieve a directory entry" doc_publish="Publish and retrieve a directory entry"
@ -131,6 +131,7 @@ setup_routing() {
set directory.service $SIDA \ set directory.service $SIDA \
set hosts.$SIDA.address 10.0.1.1 set hosts.$SIDA.address 10.0.1.1
foreach_instance +A +B +C start_routing_instance foreach_instance +A +B +C start_routing_instance
wait_until grep "DNAHELPER got STARTED ACK" $LOGA
} }
doc_routing="Ping via relay node" doc_routing="Ping via relay node"