Reviewed tests h* & i*

Localized `i' variable in `info' completion.

68 files changed, 398 insertions, 541 deletions

diff --git a/test/_completion_to_review/head.exp b/test/_completion_to_review/head.exp
deleted file mode 100644
index 6f38543b..00000000
--- a/test/_completion_to_review/head.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/head.exp"
diff --git a/test/_completion_to_review/hg.exp b/test/_completion_to_review/hg.exp
deleted file mode 100644
index 0c6aae13..00000000
--- a/test/_completion_to_review/hg.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/hg.exp"
diff --git a/test/_completion_to_review/iconv.exp b/test/_completion_to_review/iconv.exp
deleted file mode 100644
index 5c2cfbd8..00000000
--- a/test/_completion_to_review/iconv.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/iconv.exp"
diff --git a/test/_completion_to_review/id.exp b/test/_completion_to_review/id.exp
deleted file mode 100644
index 2aca482b..00000000
--- a/test/_completion_to_review/id.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/id.exp"
diff --git a/test/_completion_to_review/identify.exp b/test/_completion_to_review/identify.exp
deleted file mode 100644
index 0bbbacfb..00000000
--- a/test/_completion_to_review/identify.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/identify.exp"
diff --git a/test/_completion_to_review/ifdown.exp b/test/_completion_to_review/ifdown.exp
deleted file mode 100644
index b2776e22..00000000
--- a/test/_completion_to_review/ifdown.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/ifdown.exp"
diff --git a/test/_completion_to_review/ifup.exp b/test/_completion_to_review/ifup.exp
deleted file mode 100644
index fc1957ab..00000000
--- a/test/_completion_to_review/ifup.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/ifup.exp"
diff --git a/test/_completion_to_review/indent.exp b/test/_completion_to_review/indent.exp
deleted file mode 100644
index db4cde24..00000000
--- a/test/_completion_to_review/indent.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/indent.exp"
diff --git a/test/_completion_to_review/info.exp b/test/_completion_to_review/info.exp
deleted file mode 100644
index 32429d90..00000000
--- a/test/_completion_to_review/info.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/info.exp"
diff --git a/test/_completion_to_review/inject.exp b/test/_completion_to_review/inject.exp
deleted file mode 100644
index cf3c1951..00000000
--- a/test/_completion_to_review/inject.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/inject.exp"
diff --git a/test/_completion_to_review/insmod.exp b/test/_completion_to_review/insmod.exp
deleted file mode 100644
index da1aab8d..00000000
--- a/test/_completion_to_review/insmod.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/insmod.exp"
diff --git a/test/_completion_to_review/invoke-rc.d.exp b/test/_completion_to_review/invoke-rc.d.exp
deleted file mode 100644
index 5093383c..00000000
--- a/test/_completion_to_review/invoke-rc.d.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/invoke-rc.d.exp"
diff --git a/test/_completion_to_review/irb.exp b/test/_completion_to_review/irb.exp
deleted file mode 100644
index e598d868..00000000
--- a/test/_completion_to_review/irb.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/irb.exp"
diff --git a/test/_completion_to_review/isql.exp b/test/_completion_to_review/isql.exp
deleted file mode 100644
index b324b1ae..00000000
--- a/test/_completion_to_review/isql.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/isql.exp"
diff --git a/test/completion/head.exp b/test/completion/head.exp
new file mode 100644
index 00000000..fe064acf
--- /dev/null
+++ b/test/completion/head.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {head}]} {
+    source "lib/completions/head.exp"
+}; # if
diff --git a/test/completion/iconv.exp b/test/completion/iconv.exp
new file mode 100644
index 00000000..8e21c8a2
--- /dev/null
+++ b/test/completion/iconv.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {iconv}]} {
+    source "lib/completions/iconv.exp"
+}; # if
diff --git a/test/completion/id.exp b/test/completion/id.exp
new file mode 100644
index 00000000..e5b963ed
--- /dev/null
+++ b/test/completion/id.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {id}]} {
+    source "lib/completions/id.exp"
+}; # if
diff --git a/test/completion/identify.exp b/test/completion/identify.exp
new file mode 100644
index 00000000..ed4197e3
--- /dev/null
+++ b/test/completion/identify.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {convert}]} {
+    source "lib/completions/identify.exp"
+}; # if
diff --git a/test/completion/ifdown.exp b/test/completion/ifdown.exp
new file mode 100644
index 00000000..ca83edb4
--- /dev/null
+++ b/test/completion/ifdown.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {ifdown}]} {
+    source "lib/completions/ifdown.exp"
+}; # if
diff --git a/test/completion/ifup.exp b/test/completion/ifup.exp
new file mode 100644
index 00000000..5018e6e2
--- /dev/null
+++ b/test/completion/ifup.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {ifup}]} {
+    source "lib/completions/ifup.exp"
+}; # if
diff --git a/test/completion/indent.exp b/test/completion/indent.exp
new file mode 100644
index 00000000..d618f90c
--- /dev/null
+++ b/test/completion/indent.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {indent}]} {
+    source "lib/completions/indent.exp"
+}; # if
diff --git a/test/completion/info.exp b/test/completion/info.exp
new file mode 100644
index 00000000..82a93280
--- /dev/null
+++ b/test/completion/info.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {info}]} {
+    source "lib/completions/info.exp"
+}; # if
diff --git a/test/completion/inject.exp b/test/completion/inject.exp
new file mode 100644
index 00000000..af6bc61c
--- /dev/null
+++ b/test/completion/inject.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {inject}]} {
+    source "lib/completions/inject.exp"
+}; # if
diff --git a/test/completion/insmod.exp b/test/completion/insmod.exp
new file mode 100644
index 00000000..e86b6ce8
--- /dev/null
+++ b/test/completion/insmod.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {insmod}]} {
+    source "lib/completions/insmod.exp"
+}; # if
diff --git a/test/completion/invoke-rc.d.exp b/test/completion/invoke-rc.d.exp
new file mode 100644
index 00000000..6540317e
--- /dev/null
+++ b/test/completion/invoke-rc.d.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {invoke-rc.d}]} {
+    source "lib/completions/invoke-rc.d.exp"
+}; # if
diff --git a/test/completion/irb.exp b/test/completion/irb.exp
new file mode 100644
index 00000000..e621b78a
--- /dev/null
+++ b/test/completion/irb.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {irb}]} {
+    source "lib/completions/irb.exp"
+}; # if
diff --git a/test/completion/isql.exp b/test/completion/isql.exp
new file mode 100644
index 00000000..7cd318cd
--- /dev/null
+++ b/test/completion/isql.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {isql}]} {
+    source "lib/completions/isql.exp"
+}; # if
diff --git a/test/_completion_to_review/iwconfig.exp b/test/completion/iwconfig.exp
index 8530e05a..8530e05a 100644
--- a/test/_completion_to_review/iwconfig.exp
+++ b/test/completion/iwconfig.exp
diff --git a/test/_completion_to_review/iwlist.exp b/test/completion/iwlist.exp
index e5386fac..e5386fac 100644
--- a/test/_completion_to_review/iwlist.exp
+++ b/test/completion/iwlist.exp
diff --git a/test/_completion_to_review/iwpriv.exp b/test/completion/iwpriv.exp
index 42343945..42343945 100644
--- a/test/_completion_to_review/iwpriv.exp
+++ b/test/completion/iwpriv.exp
diff --git a/test/_completion_to_review/iwspy.exp b/test/completion/iwspy.exp
index 31e361dd..31e361dd 100644
--- a/test/_completion_to_review/iwspy.exp
+++ b/test/completion/iwspy.exp
diff --git a/test/fixtures/isql/odbc.ini b/test/fixtures/isql/odbc.ini
new file mode 100644
index 00000000..96319f3b
--- /dev/null
+++ b/test/fixtures/isql/odbc.ini
@@ -0,0 +1,3 @@
+[foo]
+
+[bar]
diff --git a/test/lib/completions/head.exp b/test/lib/completions/head.exp
new file mode 100644
index 00000000..9782f5ef
--- /dev/null
+++ b/test/lib/completions/head.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "head --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/iconv.exp b/test/lib/completions/iconv.exp
new file mode 100644
index 00000000..0089533b
--- /dev/null
+++ b/test/lib/completions/iconv.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "iconv "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/id.exp b/test/lib/completions/id.exp
new file mode 100644
index 00000000..155af52c
--- /dev/null
+++ b/test/lib/completions/id.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "id -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/identify.exp b/test/lib/completions/identify.exp
new file mode 100644
index 00000000..8f38ae47
--- /dev/null
+++ b/test/lib/completions/identify.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "identify -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ifdown.exp b/test/lib/completions/ifdown.exp
new file mode 100644
index 00000000..68225bb9
--- /dev/null
+++ b/test/lib/completions/ifdown.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "ifdown "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ifup.exp b/test/lib/completions/ifup.exp
new file mode 100644
index 00000000..9d717178
--- /dev/null
+++ b/test/lib/completions/ifup.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "ifup "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/indent.exp b/test/lib/completions/indent.exp
new file mode 100644
index 00000000..e8fc32b1
--- /dev/null
+++ b/test/lib/completions/indent.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "indent --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/info.exp b/test/lib/completions/info.exp
new file mode 100644
index 00000000..ed769f1a
--- /dev/null
+++ b/test/lib/completions/info.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "info "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/inject.exp b/test/lib/completions/inject.exp
new file mode 100644
index 00000000..7c093146
--- /dev/null
+++ b/test/lib/completions/inject.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "inject "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/insmod.exp b/test/lib/completions/insmod.exp
new file mode 100644
index 00000000..8e83f0b4
--- /dev/null
+++ b/test/lib/completions/insmod.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "insmod in"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/invoke-rc.d.exp b/test/lib/completions/invoke-rc.d.exp
new file mode 100644
index 00000000..4dc9f1d8
--- /dev/null
+++ b/test/lib/completions/invoke-rc.d.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "invoke-rc.d "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/irb.exp b/test/lib/completions/irb.exp
new file mode 100644
index 00000000..81bea6d2
--- /dev/null
+++ b/test/lib/completions/irb.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "irb "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/isql.exp b/test/lib/completions/isql.exp
new file mode 100644
index 00000000..87e16bca
--- /dev/null
+++ b/test/lib/completions/isql.exp
@@ -0,0 +1,23 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified {/ODBCINI=/d}
+}; # teardown()
+
+
+setup
+
+
+assert_bash_exec {OLDODBCINI=$ODBCINI; ODBCINI=$TESTDIR/fixtures/isql/odbc.ini}
+assert_complete_any "isql "
+sync_after_int
+assert_bash_exec {ODBCINI=$OLDODBCINI; unset -v OLDODBCINI}
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/iwconfig.exp b/test/lib/completions/iwconfig.exp
new file mode 100644
index 00000000..f09719d7
--- /dev/null
+++ b/test/lib/completions/iwconfig.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "iwconfig --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/iwlist.exp b/test/lib/completions/iwlist.exp
new file mode 100644
index 00000000..80a2c367
--- /dev/null
+++ b/test/lib/completions/iwlist.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "iwlist --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/iwpriv.exp b/test/lib/completions/iwpriv.exp
new file mode 100644
index 00000000..f3102cc5
--- /dev/null
+++ b/test/lib/completions/iwpriv.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "iwpriv --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/iwspy.exp b/test/lib/completions/iwspy.exp
new file mode 100644
index 00000000..5fa0bee5
--- /dev/null
+++ b/test/lib/completions/iwspy.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_env_unmodified "iwspy --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions_to_review/head.exp b/test/lib/completions_to_review/head.exp
deleted file mode 100644
index cb504c06..00000000
--- a/test/lib/completions_to_review/head.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "head "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/hg.exp b/test/lib/completions_to_review/hg.exp
deleted file mode 100644
index 9f09878d..00000000
--- a/test/lib/completions_to_review/hg.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "hg -R "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/iconv.exp b/test/lib/completions_to_review/iconv.exp
deleted file mode 100644
index 654772a3..00000000
--- a/test/lib/completions_to_review/iconv.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "iconv "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/id.exp b/test/lib/completions_to_review/id.exp
deleted file mode 100644
index 0ac76682..00000000
--- a/test/lib/completions_to_review/id.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "id "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/identify.exp b/test/lib/completions_to_review/identify.exp
deleted file mode 100644
index 918c843d..00000000
--- a/test/lib/completions_to_review/identify.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "identify "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/ifdown.exp b/test/lib/completions_to_review/ifdown.exp
deleted file mode 100644
index 7f1a42be..00000000
--- a/test/lib/completions_to_review/ifdown.exp
+++ /dev/null
@@ -1,27 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "ifdown "
-send "$cmd\t"
-expect {
-    -re "^$cmd.*$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sleep .5
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/ifup.exp b/test/lib/completions_to_review/ifup.exp
deleted file mode 100644
index 69918aeb..00000000
--- a/test/lib/completions_to_review/ifup.exp
+++ /dev/null
@@ -1,44 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should show completions"
-    # Try completion
-set cmd "ifup "
-send "$cmd\t"
-expect {
-    -re "^$cmd.*\r\n/@$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-set test "Argument should complete"
-    # Set test function for _configured_interfaces()
-set cmd "_configured_interfaces() { COMPREPLY=( foo bar ); }"
-send "$cmd\r"
-expect -ex "$cmd\r\n/@"
-    # Try completion
-set cmd "ifup f"
-send "$cmd\t"
-expect {
-    -re "^${cmd}oo\\s*$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/indent.exp b/test/lib/completions_to_review/indent.exp
deleted file mode 100644
index e8a8e16e..00000000
--- a/test/lib/completions_to_review/indent.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "indent "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/info.exp b/test/lib/completions_to_review/info.exp
deleted file mode 100644
index 0903da7d..00000000
--- a/test/lib/completions_to_review/info.exp
+++ /dev/null
@@ -1,31 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "info "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-# Interrupt command
-
-set test "Sync after QUIT/INT"
-sleep 0.01
-send \031\003
-expect -ex /@
-
-
-teardown
diff --git a/test/lib/completions_to_review/inject.exp b/test/lib/completions_to_review/inject.exp
deleted file mode 100644
index 3ddd21d1..00000000
--- a/test/lib/completions_to_review/inject.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "inject "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/insmod.exp b/test/lib/completions_to_review/insmod.exp
deleted file mode 100644
index ea41251b..00000000
--- a/test/lib/completions_to_review/insmod.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should show completions"
-    # Try completion
-set cmd "insmod in"
-send "$cmd\t"
-expect {
-    -re "$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/invoke-rc.d.exp b/test/lib/completions_to_review/invoke-rc.d.exp
deleted file mode 100644
index dc1e2623..00000000
--- a/test/lib/completions_to_review/invoke-rc.d.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "invoke-rc.d "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/irb.exp b/test/lib/completions_to_review/irb.exp
deleted file mode 100644
index 7adaacdb..00000000
--- a/test/lib/completions_to_review/irb.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "irb "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/isql.exp b/test/lib/completions_to_review/isql.exp
deleted file mode 100644
index 02eb540a..00000000
--- a/test/lib/completions_to_review/isql.exp
+++ /dev/null
@@ -1,34 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should show completions"
-    # Try completion
-set cmd "isql "
-send "$cmd\t"
-expect {
-	# TODO: If $ODBCINI is set, match completions
-	#       -- FVu, Fri Feb 27 22:58:05 CET 2009
-    -re "^$cmd.*" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-    # Because we don't wait for prompt (/@), wait a moment
-    # for `comp_load' to install real completion.  This can
-    # be removed if the TODO above is fixed.
-    # -- FVu, Fri Feb 27 23:14:49 CET 2009
-sleep .5
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/iwconfig.exp b/test/lib/completions_to_review/iwconfig.exp
deleted file mode 100644
index 38fffd17..00000000
--- a/test/lib/completions_to_review/iwconfig.exp
+++ /dev/null
@@ -1,40 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "iwconfig --"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-set test "Tab should not complain about _available_interfaces() not being available"
-    # Try completion
-set cmd "iwconfig #"
-send "$cmd\t"
-expect {
-    -re "^$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/iwlist.exp b/test/lib/completions_to_review/iwlist.exp
deleted file mode 100644
index 39898472..00000000
--- a/test/lib/completions_to_review/iwlist.exp
+++ /dev/null
@@ -1,31 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "iwlist --"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-# Interrupt command
-
-set test "Sync after INT"
-sleep 0.01
-send \031\003;  # QUIT/INT
-expect -ex /@
-
-
-teardown
diff --git a/test/lib/completions_to_review/iwpriv.exp b/test/lib/completions_to_review/iwpriv.exp
deleted file mode 100644
index 971b28f8..00000000
--- a/test/lib/completions_to_review/iwpriv.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "iwpriv --"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/iwspy.exp b/test/lib/completions_to_review/iwspy.exp
deleted file mode 100644
index 62f11d39..00000000
--- a/test/lib/completions_to_review/iwspy.exp
+++ /dev/null
@@ -1,31 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "iwspy --"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-# Interrupt command
-
-set test "Sync after QUIT/INT"
-sleep 0.01
-send \031\003;  # QUIT/INT
-expect -ex /@
-
-
-teardown
diff --git a/test/lib/library.exp b/test/lib/library.exp
index f5043ffa..3d927325 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -134,13 +134,23 @@ proc assert_complete_any {cmd {test ""} {prompt /@}} {
         # Escape special regexp characters
     regsub -all {([\[\]\(\)\.\\\+])} $cmd {\\\1} cmd
     expect {
+        -timeout 1
+        # Match completions, multiple words
         # NOTE: The `\S*' (zero or more non-whitespace characters) matches a
-        #       possible enlargement of a command's partial completion if the
-        #       list of completions have a larger common prefix.
+        #       longest common prefix of the completions shown.
         #       E.g. `fmt -' becomes `fmt --' (two dashes) when completing
         -re "^\r\n.*$prompt$cmd\\S*$" { pass "$test" }
+        timeout {
+            expect {
+                # Match completion, single word.  This word is shown on the
+                # same line as the command.
+                -re "^\\w+ $" { pass "$test" }
+                # Try matching multiple words again, with new timeout
+                -re "^\r\n.*$prompt$cmd\\S*$" { pass "$test" }
+            }
+        }
         -re $prompt { unresolved "$test at prompt" }
-        -re eof { unresolved "eof" }
+        eof { unresolved "eof" }
     }; # expect
 }; # assert_complete_any()