ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-16 23:18:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve test defs: create_identities() with PINs

Browse Source
This commit is contained in:
Andrew Bettison 2015-08-24 22:34:10 +09:30
parent b7ba297e31
commit 564f8973af
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
testdefs.sh
View File

@ -702,6 +702,8 @@ create_single_identity() {
# - pass [args...] to the keyring add
# - if variables DID{I}{1..N} and/or NAME{I}{1..N} are already set, then use
# them to set the DIDs and names of each identity
# - if variables PIN{I}{1..N} are already set, then use them as the --entry-pin
# option to set the DIDs and names of each identity
# - assert that all SIDs are unique
# - assert that all SIDs appear in keyring list
# - set variables SID{I}{1..N} to SIDs of identities, eg, SIDA1, SIDA2...
@ -723,11 +725,19 @@ create_identities() {
shift
local i j
for ((i = 1; i <= N; ++i)); do
executeOk_servald keyring add "${servald_options[@]}"
assert [ -e "$SERVALINSTANCE_PATH/serval.keyring" ]
local pinvar=PIN$instance_name$i
local pin="${!pinvar}"
servald_options+=(${pin:+--entry-pin="$pin"})
done
for ((i = 1; i <= N; ++i)); do
local pinvar=PIN$instance_name$i
local sidvar=SID$instance_name$i
local didvar=DID$instance_name$i
local namevar=NAME$instance_name$i
local pin="${!pinvar}"
[ -n "$pin" ] && tfw_log "$pinvar=$(shellarg "$pin")"
executeOk_servald keyring add "${servald_options[@]}" "$pin"
assert [ -e "$SERVALINSTANCE_PATH/serval.keyring" ]
extract_stdout_keyvalue $sidvar sid "$rexp_sid"
tfw_log "$sidvar=${!sidvar}"
# If the DID and/or NAME is already specified in the variables, then use