ovh/the-bastion
1
1
Fork 0
mirror of https://github.com/ovh/the-bastion.git synced 2025-10-25 12:58:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

chore: tests: don't shadow the $name var

Browse source
This commit is contained in:
Stéphane Lesimple 2021-12-27 15:30:07 +00:00 • committed by Stéphane Lesimple
parent f8f193b298
commit 4e9dffda44
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/functional/tests.d/330-selfkeys.sh
View file

@ -9,13 +9,9 @@
# also try creating an account with it (code paths from selfAddIngressKey and accountCreate differ) # also try creating an account with it (code paths from selfAddIngressKey and accountCreate differ)
_ingress_from_test() _ingress_from_test()
{ {
name="$1" local testname="$1" ip1="$2" ip2="$3" keytoadd="$4" fingerprint="$5"
ip1="$2"
ip2="$3"
keytoadd="$4"
fingerprint="$5"
script $name "echo '$keytoadd' | $a1 --osh selfAddIngressKey" script $testname "echo '$keytoadd' | $a1 --osh selfAddIngressKey"
retvalshouldbe 0 retvalshouldbe 0
json .value.connect_only_from[0] $ip1 json .value.connect_only_from[0] $ip1
json .value.connect_only_from[1] $ip2 json .value.connect_only_from[1] $ip2
@ -27,7 +23,7 @@ _ingress_from_test()
json .value.key.prefix "from=\"$ip1,$ip2\"" json .value.key.prefix "from=\"$ip1,$ip2\""
fi fi
success $name $a1 --osh selfListIngressKeys success $testname $a1 --osh selfListIngressKeys
json .value.keys[1].from_list[0] $ip1 json .value.keys[1].from_list[0] $ip1
json .value.keys[1].from_list[1] $ip2 json .value.keys[1].from_list[1] $ip2
if [ "$ip1" = null ] && [ "$ip2" = null ]; then if [ "$ip1" = null ] && [ "$ip2" = null ]; then
@ -36,18 +32,18 @@ _ingress_from_test()
json .value.keys[1].prefix "from=\"$ip1,$ip2\"" json .value.keys[1].prefix "from=\"$ip1,$ip2\""
fi fi
success $name $a1 --osh selfDelIngressKey -f "$fingerprint" success $testname $a1 --osh selfDelIngressKey -f "$fingerprint"
# now on account creation # now on account creation
grant accountCreate grant accountCreate
script $name "echo '$keytoadd' | $a0 --osh accountCreate --account $account2 --uid $uid2" script $testname "echo '$keytoadd' | $a0 --osh accountCreate --account $account2 --uid $uid2"
json .error_code OK .command accountCreate .value null json .error_code OK .command accountCreate .value null
revoke accountCreate revoke accountCreate
grant accountListIngressKeys grant accountListIngressKeys
success $name $a0 --osh accountListIngressKeys --account $account2 success $testname $a0 --osh accountListIngressKeys --account $account2
json .value.keys[0].from_list[0] $ip1 json .value.keys[0].from_list[0] $ip1
json .value.keys[0].from_list[1] $ip2 json .value.keys[0].from_list[1] $ip2
if [ "$ip1" = null ] && [ "$ip2" = null ]; then if [ "$ip1" = null ] && [ "$ip2" = null ]; then
@ -59,7 +55,7 @@ _ingress_from_test()
revoke accountListIngressKeys revoke accountListIngressKeys
grant accountDelete grant accountDelete
script $name "$a0 --osh accountDelete --account $account2" "<<< \"Yes, do as I say and delete $account2, kthxbye\"" script $testname "$a0 --osh accountDelete --account $account2" "<<< \"Yes, do as I say and delete $account2, kthxbye\""
retvalshouldbe 0 retvalshouldbe 0
json .error_code OK .command accountDelete json .error_code OK .command accountDelete