csonto/bash-completion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(testsuite) Moved unsetting COMPREPLY

Browse Source
This commit is contained in:
Freddy Vulto 2009-10-31 08:32:58 +01:00
parent 87de422e8b
commit a55d311ae2
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/lib/library.sh
View File

@ -18,11 +18,9 @@ diff_env() {
# Output array elements, sorted and separated by newline # Output array elements, sorted and separated by newline
# Unset variable after outputting. # Unset variable after outputting.
# @param $1 Name of array variable to process # @param $1 Name of array variable to process
# @param $2 -u (optional) Unset variable after echo
echo_array() { echo_array() {
local IFS=$'\n' local IFS=$'\n'
eval printf "%s" \"\${$1[*]}\" | sort eval printf "%s" \"\${$1[*]}\" | sort
unset -v $1
} }

8
test/unit/_known_hosts_real.exp
View File

@ -16,7 +16,7 @@ set hosts [get_hosts]
# Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config # Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config
# doo, ike, jub, 10.0.0.1, kyl and 100.0.0.2 in ./fixtures/_known_hosts_real/known_hosts # doo, ike, jub, 10.0.0.1, kyl and 100.0.0.2 in ./fixtures/_known_hosts_real/known_hosts
lappend hosts doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 lappend hosts doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2
set cmd {_known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY} set cmd {unset COMPREPLY; _known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY}
assert_bash_list $hosts $cmd $test assert_bash_list $hosts $cmd $test
@ -34,7 +34,7 @@ foreach host $hosts {
lappend expected "user@$host:" lappend expected "user@$host:"
}; # foreach }; # foreach
# Call _known_hosts # Call _known_hosts
set cmd {_known_hosts_real -acF fixtures/_known_hosts_real/config 'user@'; echo_array COMPREPLY} set cmd {unset COMPREPLY; _known_hosts_real -acF fixtures/_known_hosts_real/config 'user@'; echo_array COMPREPLY}
assert_bash_list $expected $cmd $test assert_bash_list $expected $cmd $test
@ -49,7 +49,7 @@ lappend hosts gee hus doo ike two
set hosts [lsort -ascii $hosts] set hosts [lsort -ascii $hosts]
set hosts [join $hosts "\\s+"] set hosts [join $hosts "\\s+"]
# Call _known_hosts # Call _known_hosts
set cmd {_known_hosts_real -aF 'fixtures/_known_hosts_real/spaced conf' ''; echo_array COMPREPLY} set cmd {unset COMPREPLY; _known_hosts_real -aF 'fixtures/_known_hosts_real/spaced conf' ''; echo_array COMPREPLY}
send "$cmd\r" send "$cmd\r"
expect -ex "$cmd\r\n" expect -ex "$cmd\r\n"
expect { expect {
@ -69,7 +69,7 @@ set hosts [get_hosts_avahi]
# doo, ike, jub, 10.0.0.1, kyl and 100.0.0.2 in ./fixtures/_known_hosts_real/known_hosts # doo, ike, jub, 10.0.0.1, kyl and 100.0.0.2 in ./fixtures/_known_hosts_real/known_hosts
lappend hosts doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 lappend hosts doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2
# Call _known_hosts # Call _known_hosts
set cmd {_known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY} set cmd {unset COMPREPLY; _known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY}
assert_bash_list $hosts $cmd $test assert_bash_list $hosts $cmd $test
sync_after_int sync_after_int
assert_bash_exec "unset -v COMP_KNOWN_HOSTS_WITH_HOSTFILE" assert_bash_exec "unset -v COMP_KNOWN_HOSTS_WITH_HOSTFILE"