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

Fix broken 'dnaprotocol' tests

Browse Source 
Explicitly create identities in 'dnaprotocol' fixtures because
start_servald_instances() no longer does it.

The create_single_identity() function was not setting NAMEA, NAMEB, etc.  when
they contained a space, because of shell misquoting.
(cherry picked from commit 9d8707a0add0c5fd3578abff8ccb18b1325fd36d)
This commit is contained in:
Andrew Bettison 2012-09-17 15:30:05 +09:30
parent c1695a67b2
commit d26c3f67e8
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
testdefs.sh
View File

@ -471,12 +471,18 @@ create_single_identity() {
local sidvar=SID${instance_name}1
local didvar=DID${instance_name}1
local namevar=NAME${instance_name}1
eval "$didvar=\${1-\$((5550000 + \$instance_number))}"
eval "$namevar=\${2-Agent \$instance_name Smith}"
eval "$didvar=\"\${1-\$((5550000 + \$instance_number))}\""
eval "$namevar=\"\${2-Agent \$instance_name Smith}\""
create_identities 1
eval SID$instance_name="${!sidvar}"
eval DID$instance_name="${!didvar}"
eval NAME$instance_name="${!namevar}"
eval "SID$instance_name=\"\${!sidvar}\""
eval "DID$instance_name=\"\${!didvar}\""
eval "NAME$instance_name=\"\${!namevar}\""
sidvar=SID${instance_name}
didvar=DID${instance_name}
namevar=NAME${instance_name}
tfw_log "SID$instance_name=$(shellarg "${!sidvar}")"
tfw_log "DID$instance_name=$(shellarg "${!didvar}")"
tfw_log "NAME$instance_name=$(shellarg "${!namevar}")"
}
# Utility function:
@ -510,9 +516,11 @@ create_identities() {
executeOk_servald set did "${!sidvar}" "${!didvar}" "${!namevar}"
eval "$didvar=\${!didvar}"
eval "$namevar=\${!namevar}"
tfw_log "$didvar=$(shellarg "${!didvar}")"
tfw_log "$namevar=$(shellarg "${!namevar}")"
else
extract_stdout_keyvalue_optional $didvar did "$rexp_did" && tfw_log "$didvar=${!didvar}"
extract_stdout_keyvalue_optional $namevar name ".*" && tfw_log "$namevar=${!namevar}"
extract_stdout_keyvalue_optional $didvar did "$rexp_did" && tfw_log "$didvar=$(shellarg "${!didvar}")"
extract_stdout_keyvalue_optional $namevar name ".*" && tfw_log "$namevar=$(shellarg "${!namevar}")"
fi
done
for ((i = 1; i <= N; ++i)); do

7
tests/dnaprotocol
View File

@ -39,6 +39,7 @@ instances_reach_each_other() {
setup() {
setup_servald
assert_no_servald_processes
foreach_instance +A +B create_single_identity
configure_servald_server() { set_server_vars; }
start_servald_instances +A +B
wait_until --sleep=0.25 instances_reach_each_other +A +B
@ -70,6 +71,7 @@ doc_MultiServer="Start three servald servers with dummy interfaces"
setup_MultiServer() {
setup_servald
assert_no_servald_processes
foreach_instance +A +B +C create_single_identity
configure_servald_server() { set_server_vars; }
}
test_MultiServer() {
@ -80,8 +82,8 @@ doc_LookupWildcard="Lookup by wildcard"
test_LookupWildcard() {
executeOk_servald dna lookup "*"
assertStdoutLineCount '==' 2
assertStdoutGrep --matches=1 "^sid://$SIDA/$DIDA:$DIDA:$NAMEA$"
assertStdoutGrep --matches=1 "^sid://$SIDB/$DIDB:$DIDB:$NAMEB$"
assertStdoutGrep --matches=1 "^sid://$SIDA/$DIDA:$DIDA:$NAMEA\$"
assertStdoutGrep --matches=1 "^sid://$SIDB/$DIDB:$DIDB:$NAMEB\$"
}
doc_LookupEmpty="Lookup by empty string"
@ -164,6 +166,7 @@ do
done
EOF
chmod 0755 "$dnahelper"
foreach_instance +A +B +C +D create_single_identity
configure_servald_server() {
set_server_vars
executeOk_servald config set debug.dnahelper on