[Bash-completion-commits] [SCM] bash-completion branch, master, updated. c89152b6b2bdf0b45c5f0bc68fcd81ca7dc2ddc9

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 79b998442e424ec0d6223ca4dd95763bcbc232f3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Apr 12 20:35:16 2010 +0300

    Run tests based on installed completions, not just command availability.
    
    http://lists.alioth.debian.org/pipermail/bash-completion-devel/2010-February/002556.html

diff --git a/test/completion/a2ps.exp b/test/completion/a2ps.exp
index ce96ad1..06927b5 100644
--- a/test/completion/a2ps.exp
+++ b/test/completion/a2ps.exp
@@ -1,3 +1 @@
-if {[assert_bash_type a2ps]} {
-    source "lib/completions/a2ps.exp"
-}; # if
+assert_source_completions a2ps
diff --git a/test/completion/abook.exp b/test/completion/abook.exp
index 1ec636e..eaa4b30 100644
--- a/test/completion/abook.exp
+++ b/test/completion/abook.exp
@@ -1,3 +1 @@
-if {[assert_bash_type abook]} {
-    source "lib/completions/abook.exp"
-}; # if
+assert_source_completions abook
diff --git a/test/completion/add_members.exp b/test/completion/add_members.exp
index 7245e91..17aacd0 100644
--- a/test/completion/add_members.exp
+++ b/test/completion/add_members.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {add_members}]} {
-    source "lib/completions/add_members.exp"
-}; # if
+assert_source_completions add_members
diff --git a/test/completion/alias.exp b/test/completion/alias.exp
index 9206d49..ee7cf4b 100644
--- a/test/completion/alias.exp
+++ b/test/completion/alias.exp
@@ -1,3 +1 @@
-if {[assert_bash_type alias]} {
-    source "lib/completions/alias.exp"
-}; # if
+assert_source_completions alias
diff --git a/test/completion/animate.exp b/test/completion/animate.exp
index 8db9d3e..2f4e749 100644
--- a/test/completion/animate.exp
+++ b/test/completion/animate.exp
@@ -1,3 +1 @@
-if {[assert_bash_type animate]} {
-    source "lib/completions/animate.exp"
-}; # if
+assert_source_completions animate
diff --git a/test/completion/ant.exp b/test/completion/ant.exp
index 463ff7b..ad6996b 100644
--- a/test/completion/ant.exp
+++ b/test/completion/ant.exp
@@ -1,3 +1 @@
-if {[assert_bash_type ant]} {
-    source "lib/completions/ant.exp"
-}; # if
+assert_source_completions ant
diff --git a/test/completion/apt-build.exp b/test/completion/apt-build.exp
index a184099..48bbe58 100644
--- a/test/completion/apt-build.exp
+++ b/test/completion/apt-build.exp
@@ -1,3 +1 @@
-if {[assert_bash_type apt-build]} {
-    source "lib/completions/apt-build.exp"
-}; # if
+assert_source_completions apt-build
diff --git a/test/completion/apt-cache.exp b/test/completion/apt-cache.exp
index b6c9bf8..901c5e8 100644
--- a/test/completion/apt-cache.exp
+++ b/test/completion/apt-cache.exp
@@ -1,3 +1 @@
-if {[assert_bash_type apt-cache]} {
-    source "lib/completions/apt-cache.exp"
-}; # if
+assert_source_completions apt-cache
diff --git a/test/completion/apt-get.exp b/test/completion/apt-get.exp
index fbec444..04fbf63 100644
--- a/test/completion/apt-get.exp
+++ b/test/completion/apt-get.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {apt-get}]} {
-    source "lib/completions/apt-get.exp"
-}; # if
+assert_source_completions apt-get
diff --git a/test/completion/aptitude.exp b/test/completion/aptitude.exp
index 68185a9..6afbacc 100644
--- a/test/completion/aptitude.exp
+++ b/test/completion/aptitude.exp
@@ -1,3 +1 @@
-if {[assert_bash_type aptitude]} {
-    source "lib/completions/aptitude.exp"
-}; # if
+assert_source_completions aptitude
diff --git a/test/completion/arch.exp b/test/completion/arch.exp
index 21066e4..254acd5 100644
--- a/test/completion/arch.exp
+++ b/test/completion/arch.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {arch}] && [assert_bash_type {mailmanctl}]} {
-    source "lib/completions/arch.exp"
-}; # if
+assert_source_completions arch
diff --git a/test/completion/arpspoof.exp b/test/completion/arpspoof.exp
index a4c1a3e..d4f9341 100644
--- a/test/completion/arpspoof.exp
+++ b/test/completion/arpspoof.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {arpspoof}]} {
-    source "lib/completions/arpspoof.exp"
-}; # if
+assert_source_completions arpspoof
diff --git a/test/completion/aspell.exp b/test/completion/aspell.exp
index ca7da26..5592574 100644
--- a/test/completion/aspell.exp
+++ b/test/completion/aspell.exp
@@ -1,3 +1 @@
-if {[assert_bash_type aspell]} {
-    source "lib/completions/aspell.exp"
-}; # if
+assert_source_completions aspell
diff --git a/test/completion/autoconf.exp b/test/completion/autoconf.exp
index b5f2127..6494243 100644
--- a/test/completion/autoconf.exp
+++ b/test/completion/autoconf.exp
@@ -1,3 +1 @@
-if {[assert_bash_type autoconf]} {
-    source "lib/completions/autoconf.exp"
-}; # if
+assert_source_completions autoconf
diff --git a/test/completion/automake.exp b/test/completion/automake.exp
index dd77e66..af41241 100644
--- a/test/completion/automake.exp
+++ b/test/completion/automake.exp
@@ -1,3 +1 @@
-if {[assert_bash_type automake]} {
-    source "lib/completions/automake.exp"
-}; # if
+assert_source_completions automake
diff --git a/test/completion/awk.exp b/test/completion/awk.exp
index e87b1a2..4257259 100644
--- a/test/completion/awk.exp
+++ b/test/completion/awk.exp
@@ -1,3 +1 @@
-if {[assert_bash_type awk]} {
-    source "lib/completions/awk.exp"
-}; # if
+assert_source_completions awk
diff --git a/test/completion/bash.exp b/test/completion/bash.exp
index b9fa8c8..c00fc09 100644
--- a/test/completion/bash.exp
+++ b/test/completion/bash.exp
@@ -1,3 +1 @@
-if {[assert_bash_type bash]} {
-    source "lib/completions/bash.exp"
-}; # if
+assert_source_completions bash
diff --git a/test/completion/bc.exp b/test/completion/bc.exp
index c177a5b..8b7a3d0 100644
--- a/test/completion/bc.exp
+++ b/test/completion/bc.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {bc}]} {
-    source "lib/completions/bc.exp"
-}; # if
+assert_source_completions bc
diff --git a/test/completion/bison.exp b/test/completion/bison.exp
index f9b3756..ac40ccc 100644
--- a/test/completion/bison.exp
+++ b/test/completion/bison.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {bison}]} {
-    source "lib/completions/bison.exp"
-}; # if
+assert_source_completions bison
diff --git a/test/completion/bk.exp b/test/completion/bk.exp
index 740e3c2..10540b7 100644
--- a/test/completion/bk.exp
+++ b/test/completion/bk.exp
@@ -1,3 +1 @@
-if {[assert_bash_type bk]} {
-    source "lib/completions/bk.exp"
-}; # if
+assert_source_completions bk
diff --git a/test/completion/btdownloadcurses.py.exp b/test/completion/btdownloadcurses.py.exp
index 5b0db66..fc9d95f 100644
--- a/test/completion/btdownloadcurses.py.exp
+++ b/test/completion/btdownloadcurses.py.exp
@@ -1,3 +1 @@
-if {[assert_bash_type btdownloadcurses.py]} {
-    source "lib/completions/btdownloadcurses.py.exp"
-}; # if
+assert_source_completions btdownloadcurses.py
diff --git a/test/completion/btdownloadgui.py.exp b/test/completion/btdownloadgui.py.exp
index 8ce38f8..e617156 100644
--- a/test/completion/btdownloadgui.py.exp
+++ b/test/completion/btdownloadgui.py.exp
@@ -1,3 +1 @@
-if {[assert_bash_type btdownloadgui.py]} {
-    source "lib/completions/btdownloadgui.py.exp"
-}; # if
+assert_source_completions btdownloadgui.py
diff --git a/test/completion/btdownloadheadless.py.exp b/test/completion/btdownloadheadless.py.exp
index 67fff56..fc4f256 100644
--- a/test/completion/btdownloadheadless.py.exp
+++ b/test/completion/btdownloadheadless.py.exp
@@ -1,3 +1 @@
-if {[assert_bash_type btdownloadheadless.py]} {
-    source "lib/completions/btdownloadheadless.py.exp"
-}; # if
+assert_source_completions btdownloadheadless.py
diff --git a/test/completion/bzip2.exp b/test/completion/bzip2.exp
index fd7c85d..b395314 100644
--- a/test/completion/bzip2.exp
+++ b/test/completion/bzip2.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {bzip2}]} {
-    source "lib/completions/bzip2.exp"
-}; # if
+assert_source_completions bzip2
diff --git a/test/completion/c++.exp b/test/completion/c++.exp
index abaa7be..b00bf8c 100644
--- a/test/completion/c++.exp
+++ b/test/completion/c++.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gcc}]} {
-    source "lib/completions/c++.exp"
-}; # if
+assert_source_completions c++
diff --git a/test/completion/cancel.exp b/test/completion/cancel.exp
index b97e25f..67c4710 100644
--- a/test/completion/cancel.exp
+++ b/test/completion/cancel.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {cancel}]} {
-    source "lib/completions/cancel.exp"
-}; # if
+assert_source_completions cancel
diff --git a/test/completion/cardctl.exp b/test/completion/cardctl.exp
index 4b4e9f9..99d0276 100644
--- a/test/completion/cardctl.exp
+++ b/test/completion/cardctl.exp
@@ -1,3 +1 @@
-if {[assert_bash_type cardctl]} {
-    source "lib/completions/cardctl.exp"
-}; # if
+assert_source_completions cardctl
diff --git a/test/completion/cat.exp b/test/completion/cat.exp
index 8bcc81b..15588ac 100644
--- a/test/completion/cat.exp
+++ b/test/completion/cat.exp
@@ -1,3 +1 @@
-if {[assert_bash_type cat]} {
-    source "lib/completions/cat.exp"
-}; # if
+assert_source_completions cat
diff --git a/test/completion/cc.exp b/test/completion/cc.exp
index b3ba6d3..af39132 100644
--- a/test/completion/cc.exp
+++ b/test/completion/cc.exp
@@ -1,3 +1 @@
-if {[assert_bash_type cc]} {
-    source "lib/completions/cc.exp"
-}; # if
+assert_source_completions cc
diff --git a/test/completion/cd.exp b/test/completion/cd.exp
index 70eca11..94c3c59 100644
--- a/test/completion/cd.exp
+++ b/test/completion/cd.exp
@@ -1,3 +1 @@
-if {[assert_bash_type cd]} {
-    source "lib/completions/cd.exp"
-}; # if
+assert_source_completions cd
diff --git a/test/completion/cdrecord.exp b/test/completion/cdrecord.exp
index 2954951..9aaa757 100644
--- a/test/completion/cdrecord.exp
+++ b/test/completion/cdrecord.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {cdrecord}]} {
-    source "lib/completions/cdrecord.exp"
-}; # if
+assert_source_completions cdrecord
diff --git a/test/completion/change_pw.exp b/test/completion/change_pw.exp
index 2a1334c..0b152a1 100644
--- a/test/completion/change_pw.exp
+++ b/test/completion/change_pw.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {change_pw}]} {
-    source "lib/completions/change_pw.exp"
-}; # if
+assert_source_completions change_pw
diff --git a/test/completion/check_db.exp b/test/completion/check_db.exp
index 09fddb2..cf13687 100644
--- a/test/completion/check_db.exp
+++ b/test/completion/check_db.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {check_db}]} {
-    source "lib/completions/check_db.exp"
-}; # if
+assert_source_completions check_db
diff --git a/test/completion/check_perms.exp b/test/completion/check_perms.exp
index a7b9d2d..860e8d7 100644
--- a/test/completion/check_perms.exp
+++ b/test/completion/check_perms.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {check_perms}]} {
-    source "lib/completions/check_perms.exp"
-}; # if
+assert_source_completions check_perms
diff --git a/test/completion/chkconfig.exp b/test/completion/chkconfig.exp
index 22d559c..38b4226 100644
--- a/test/completion/chkconfig.exp
+++ b/test/completion/chkconfig.exp
@@ -1,3 +1 @@
-if {[assert_bash_type chkconfig]} {
-    source "lib/completions/chkconfig.exp"
-}; # if
+assert_source_completions chkconfig
diff --git a/test/completion/chown.exp b/test/completion/chown.exp
index 05ad230..53d497c 100644
--- a/test/completion/chown.exp
+++ b/test/completion/chown.exp
@@ -1,3 +1 @@
-if {[assert_bash_type chown]} {
-    source "lib/completions/chown.exp"
-}; # if
+assert_source_completions chown
diff --git a/test/completion/ci.exp b/test/completion/ci.exp
index 04b3faf..03e417a 100644
--- a/test/completion/ci.exp
+++ b/test/completion/ci.exp
@@ -1,3 +1 @@
-if {[assert_bash_type ci]} {
-    source "lib/completions/ci.exp"
-}; # if
+assert_source_completions ci
diff --git a/test/completion/civclient.exp b/test/completion/civclient.exp
index 45eeb3f..9ad3a3a 100644
--- a/test/completion/civclient.exp
+++ b/test/completion/civclient.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {civclient}]} {
-    source "lib/completions/civclient.exp"
-}; # if
+assert_source_completions civclient
diff --git a/test/completion/civserver.exp b/test/completion/civserver.exp
index f16419f..d590e0c 100644
--- a/test/completion/civserver.exp
+++ b/test/completion/civserver.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {civserver}]} {
-    source "lib/completions/civserver.exp"
-}; # if
+assert_source_completions civserver
diff --git a/test/completion/cksfv.exp b/test/completion/cksfv.exp
index b7fc908..293096f 100644
--- a/test/completion/cksfv.exp
+++ b/test/completion/cksfv.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {cksfv}]} {
-    source "lib/completions/cksfv.exp"
-}; # if
+assert_source_completions cksfv
diff --git a/test/completion/cleanarch.exp b/test/completion/cleanarch.exp
index 925ab60..93646e0 100644
--- a/test/completion/cleanarch.exp
+++ b/test/completion/cleanarch.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {cleanarch}]} {
-    source "lib/completions/cleanarch.exp"
-}; # if
+assert_source_completions cleanarch
diff --git a/test/completion/clisp.exp b/test/completion/clisp.exp
index 7231834..f4203ef 100644
--- a/test/completion/clisp.exp
+++ b/test/completion/clisp.exp
@@ -1,3 +1 @@
-if {[assert_bash_type clisp]} {
-    source "lib/completions/clisp.exp"
-}; # if
+assert_source_completions clisp
diff --git a/test/completion/clone_member.exp b/test/completion/clone_member.exp
index f8d10fa..04dcfe9 100644
--- a/test/completion/clone_member.exp
+++ b/test/completion/clone_member.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {clone_member}]} {
-    source "lib/completions/clone_member.exp"
-}; # if
+assert_source_completions clone_member
diff --git a/test/completion/co.exp b/test/completion/co.exp
index d9a17e4..e8babba 100644
--- a/test/completion/co.exp
+++ b/test/completion/co.exp
@@ -1,3 +1 @@
-if {[assert_bash_type co]} {
-    source "lib/completions/co.exp"
-}; # if
+assert_source_completions co
diff --git a/test/completion/composite.exp b/test/completion/composite.exp
index fdb135e..0eaf615 100644
--- a/test/completion/composite.exp
+++ b/test/completion/composite.exp
@@ -1,3 +1 @@
-if {[assert_bash_type composite]} {
-    source "lib/completions/composite.exp"
-}; # if
+assert_source_completions composite
diff --git a/test/completion/config_list.exp b/test/completion/config_list.exp
index 749e7fa..4098623 100644
--- a/test/completion/config_list.exp
+++ b/test/completion/config_list.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {config_list}]} {
-    source "lib/completions/config_list.exp"
-}; # if
+assert_source_completions config_list
diff --git a/test/completion/configure.exp b/test/completion/configure.exp
index 9041099..cf5611c 100644
--- a/test/completion/configure.exp
+++ b/test/completion/configure.exp
@@ -1,3 +1 @@
-if {[assert_bash_type configure]} {
-    source "lib/completions/configure.exp"
-}; # if
+assert_source_completions configure
diff --git a/test/completion/convert.exp b/test/completion/convert.exp
index e4f8365..27fcc6d 100644
--- a/test/completion/convert.exp
+++ b/test/completion/convert.exp
@@ -1,3 +1 @@
-if {[assert_bash_type convert]} {
-    source "lib/completions/convert.exp"
-}; # if
+assert_source_completions convert
diff --git a/test/completion/cp.exp b/test/completion/cp.exp
index d75048f..db7b699 100644
--- a/test/completion/cp.exp
+++ b/test/completion/cp.exp
@@ -1,3 +1 @@
-if {[assert_bash_type cp]} {
-    source "lib/completions/cp.exp"
-}; # if
+assert_source_completions cp
diff --git a/test/completion/cpio.exp b/test/completion/cpio.exp
index 164ad66..c3fae7a 100644
--- a/test/completion/cpio.exp
+++ b/test/completion/cpio.exp
@@ -1,3 +1 @@
-if {[assert_bash_type cpio]} {
-    source "lib/completions/cpio.exp"
-}; # if
+assert_source_completions cpio
diff --git a/test/completion/createdb.exp b/test/completion/createdb.exp
index c7d70ec..db76b2c 100644
--- a/test/completion/createdb.exp
+++ b/test/completion/createdb.exp
@@ -1,3 +1 @@
-if {[assert_bash_type createdb]} {
-    source "lib/completions/createdb.exp"
-}; # if
+assert_source_completions createdb
diff --git a/test/completion/csplit.exp b/test/completion/csplit.exp
index 8c82798..d104985 100644
--- a/test/completion/csplit.exp
+++ b/test/completion/csplit.exp
@@ -1,3 +1 @@
-if {[assert_bash_type csplit]} {
-    source "lib/completions/csplit.exp"
-}; # if
+assert_source_completions csplit
diff --git a/test/completion/cut.exp b/test/completion/cut.exp
index 523a3b4..8785813 100644
--- a/test/completion/cut.exp
+++ b/test/completion/cut.exp
@@ -1,3 +1 @@
-if {[assert_bash_type cut]} {
-    source "lib/completions/cut.exp"
-}; # if
+assert_source_completions cut
diff --git a/test/completion/cvs.exp b/test/completion/cvs.exp
index b2379c7..3515047 100644
--- a/test/completion/cvs.exp
+++ b/test/completion/cvs.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {cvs}]} {
-    source "lib/completions/cvs.exp"
-}; # if
+assert_source_completions cvs
diff --git a/test/completion/cvsps.exp b/test/completion/cvsps.exp
index 771d584..e6e3173 100644
--- a/test/completion/cvsps.exp
+++ b/test/completion/cvsps.exp
@@ -1,3 +1 @@
-if {[assert_bash_type cvsps]} {
-    source "lib/completions/cvsps.exp"
-}; # if
+assert_source_completions cvsps
diff --git a/test/completion/date.exp b/test/completion/date.exp
index ce6fce1..098ca45 100644
--- a/test/completion/date.exp
+++ b/test/completion/date.exp
@@ -1,3 +1 @@
-if {[assert_bash_type date]} {
-    source "lib/completions/date.exp"
-}; # if
+assert_source_completions date
diff --git a/test/completion/dcop.exp b/test/completion/dcop.exp
index 62942c1..d0d0fcc 100644
--- a/test/completion/dcop.exp
+++ b/test/completion/dcop.exp
@@ -1,3 +1 @@
-if {[assert_bash_type dcop]} {
-    source "lib/completions/dcop.exp"
-}; # if
+assert_source_completions dcop
diff --git a/test/completion/dd.exp b/test/completion/dd.exp
index bda4a1d..e53ab66 100644
--- a/test/completion/dd.exp
+++ b/test/completion/dd.exp
@@ -1,3 +1 @@
-if {[assert_bash_type dd]} {
-    source "lib/completions/dd.exp"
-}; # if
+assert_source_completions dd
diff --git a/test/completion/df.exp b/test/completion/df.exp
index 771648b..3840252 100644
--- a/test/completion/df.exp
+++ b/test/completion/df.exp
@@ -1,3 +1 @@
-if {[assert_bash_type df]} {
-    source "lib/completions/df.exp"
-}; # if
+assert_source_completions df
diff --git a/test/completion/dhclient.exp b/test/completion/dhclient.exp
index 77dd76c..ef8b6a8 100644
--- a/test/completion/dhclient.exp
+++ b/test/completion/dhclient.exp
@@ -1,3 +1 @@
-if {[assert_bash_type dhclient]} {
-    source "lib/completions/dhclient.exp"
-}; # if
+assert_source_completions dhclient
diff --git a/test/completion/dict.exp b/test/completion/dict.exp
index 3b08a1e..0860b22 100644
--- a/test/completion/dict.exp
+++ b/test/completion/dict.exp
@@ -1,3 +1 @@
-if {[assert_bash_type dict]} {
-    source "lib/completions/dict.exp"
-}; # if
+assert_source_completions dict
diff --git a/test/completion/diff.exp b/test/completion/diff.exp
index ffc3a9d..63e11c7 100644
--- a/test/completion/diff.exp
+++ b/test/completion/diff.exp
@@ -1,3 +1 @@
-if {[assert_bash_type diff]} {
-    source "lib/completions/diff.exp"
-}; # if
+assert_source_completions diff
diff --git a/test/completion/dir.exp b/test/completion/dir.exp
index 2a435e0..fa4c12f 100644
--- a/test/completion/dir.exp
+++ b/test/completion/dir.exp
@@ -1,3 +1 @@
-if {[assert_bash_type dir]} {
-    source "lib/completions/dir.exp"
-}; # if
+assert_source_completions dir
diff --git a/test/completion/display.exp b/test/completion/display.exp
index 118da56..a37de27 100644
--- a/test/completion/display.exp
+++ b/test/completion/display.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {display}]} {
-    source "lib/completions/display.exp"
-}; # if
+assert_source_completions display
diff --git a/test/completion/dnsspoof.exp b/test/completion/dnsspoof.exp
index a3ce7dd..c7110c5 100644
--- a/test/completion/dnsspoof.exp
+++ b/test/completion/dnsspoof.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {dnsspoof}]} {
-    source "lib/completions/dnsspoof.exp"
-}; # if
+assert_source_completions dnsspoof
diff --git a/test/completion/dpkg-deb.exp b/test/completion/dpkg-deb.exp
index cb27fff..4f113ec 100644
--- a/test/completion/dpkg-deb.exp
+++ b/test/completion/dpkg-deb.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {dpkg-deb}]} {
-    source "lib/completions/dpkg-deb.exp"
-}; # if
+assert_source_completions dpkg-deb
diff --git a/test/completion/dpkg-reconfigure.exp b/test/completion/dpkg-reconfigure.exp
index f37e0ca..8d22071 100644
--- a/test/completion/dpkg-reconfigure.exp
+++ b/test/completion/dpkg-reconfigure.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {dpkg-reconfigure}]} {
-    source "lib/completions/dpkg-reconfigure.exp"
-}; # if
+assert_source_completions dpkg-reconfigure
diff --git a/test/completion/dpkg-source.exp b/test/completion/dpkg-source.exp
index 990c94b..4a7badf 100644
--- a/test/completion/dpkg-source.exp
+++ b/test/completion/dpkg-source.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {dpkg-source}]} {
-    source "lib/completions/dpkg-source.exp"
-}; # if
+assert_source_completions dpkg-source
diff --git a/test/completion/dpkg.exp b/test/completion/dpkg.exp
index 253bfe4..934c347 100644
--- a/test/completion/dpkg.exp
+++ b/test/completion/dpkg.exp
@@ -1,3 +1 @@
-if {[assert_bash_type dpkg]} {
-    source "lib/completions/dpkg.exp"
-}; # if
+assert_source_completions dpkg
diff --git a/test/completion/dropdb.exp b/test/completion/dropdb.exp
index b65c794..ce35fd5 100644
--- a/test/completion/dropdb.exp
+++ b/test/completion/dropdb.exp
@@ -1,3 +1 @@
-if {[assert_bash_type dropdb]} {
-    source "lib/completions/dropdb.exp"
-}; # if
+assert_source_completions dropdb
diff --git a/test/completion/dselect.exp b/test/completion/dselect.exp
index 48dbe42..716b6a2 100644
--- a/test/completion/dselect.exp
+++ b/test/completion/dselect.exp
@@ -1,3 +1 @@
-if {[assert_bash_type dselect]} {
-    source "lib/completions/dselect.exp"
-}; # if
+assert_source_completions dselect
diff --git a/test/completion/dsniff.exp b/test/completion/dsniff.exp
index 4a6b148..452beeb 100644
--- a/test/completion/dsniff.exp
+++ b/test/completion/dsniff.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {dsniff}]} {
-    source "lib/completions/dsniff.exp"
-}; # if
+assert_source_completions dsniff
diff --git a/test/completion/du.exp b/test/completion/du.exp
index 71a0e4a..ec7a994 100644
--- a/test/completion/du.exp
+++ b/test/completion/du.exp
@@ -1,3 +1 @@
-if {[assert_bash_type du]} {
-    source "lib/completions/du.exp"
-}; # if
+assert_source_completions du
diff --git a/test/completion/dumpdb.exp b/test/completion/dumpdb.exp
index 085b752..1bfaecc 100644
--- a/test/completion/dumpdb.exp
+++ b/test/completion/dumpdb.exp
@@ -1,3 +1 @@
-if {[assert_bash_type dumpdb]} {
-    source "lib/completions/dumpdb.exp"
-}; # if
+assert_source_completions dumpdb
diff --git a/test/completion/enscript.exp b/test/completion/enscript.exp
index ec6d75c..4ea7b02 100644
--- a/test/completion/enscript.exp
+++ b/test/completion/enscript.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {enscript}]} {
-    source "lib/completions/enscript.exp"
-}; # if
+assert_source_completions enscript
diff --git a/test/completion/env.exp b/test/completion/env.exp
index a96c053..baf3f75 100644
--- a/test/completion/env.exp
+++ b/test/completion/env.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {env}]} {
-    source "lib/completions/env.exp"
-}; # if
+assert_source_completions env
diff --git a/test/completion/evince.exp b/test/completion/evince.exp
index 95b0ca4..27376e0 100644
--- a/test/completion/evince.exp
+++ b/test/completion/evince.exp
@@ -1,3 +1 @@
-if {[assert_bash_type evince]} {
-    source "lib/completions/evince.exp"
-}; # if
+assert_source_completions evince
diff --git a/test/completion/expand.exp b/test/completion/expand.exp
index 783069d..1bb7dd6 100644
--- a/test/completion/expand.exp
+++ b/test/completion/expand.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {expand}]} {
-    source "lib/completions/expand.exp"
-}; # if
+assert_source_completions expand
diff --git a/test/completion/filesnarf.exp b/test/completion/filesnarf.exp
index d4ca737..20af634 100644
--- a/test/completion/filesnarf.exp
+++ b/test/completion/filesnarf.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {filesnarf}]} {
-    source "lib/completions/filesnarf.exp"
-}; # if
+assert_source_completions filesnarf
diff --git a/test/completion/find.exp b/test/completion/find.exp
index b82e132..dc73012 100644
--- a/test/completion/find.exp
+++ b/test/completion/find.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {find}]} {
-    source "lib/completions/find.exp"
-}; # if
+assert_source_completions find
diff --git a/test/completion/find_member.exp b/test/completion/find_member.exp
index 6bd3280..c8e4548 100644
--- a/test/completion/find_member.exp
+++ b/test/completion/find_member.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {find_member}]} {
-    source "lib/completions/find_member.exp"
-}; # if
+assert_source_completions find_member
diff --git a/test/completion/fmt.exp b/test/completion/fmt.exp
index abb52c1..44ed214 100644
--- a/test/completion/fmt.exp
+++ b/test/completion/fmt.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {fmt}]} {
-    source "lib/completions/fmt.exp"
-}; # if
+assert_source_completions fmt
diff --git a/test/completion/fold.exp b/test/completion/fold.exp
index 5e8d376..eec92d3 100644
--- a/test/completion/fold.exp
+++ b/test/completion/fold.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {fold}]} {
-    source "lib/completions/fold.exp"
-}; # if
+assert_source_completions fold
diff --git a/test/completion/g++.exp b/test/completion/g++.exp
index 3210ed2..9635d93 100644
--- a/test/completion/g++.exp
+++ b/test/completion/g++.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gcc}]} {
-    source "lib/completions/g++.exp"
-}; # if
+assert_source_completions g++
diff --git a/test/completion/g4.exp b/test/completion/g4.exp
index 1074d02..7bf0b16 100644
--- a/test/completion/g4.exp
+++ b/test/completion/g4.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {g4}]} {
-    source "lib/completions/g4.exp"
-}; # if
+assert_source_completions g4
diff --git a/test/completion/g77.exp b/test/completion/g77.exp
index 0c592ae..9a78cac 100644
--- a/test/completion/g77.exp
+++ b/test/completion/g77.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gcc}]} {
-    source "lib/completions/g77.exp"
-}; # if
+assert_source_completions g77
diff --git a/test/completion/gcc.exp b/test/completion/gcc.exp
index 2b1d9ba..749fafe 100644
--- a/test/completion/gcc.exp
+++ b/test/completion/gcc.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gcc}]} {
-    source "lib/completions/gcc.exp"
-}; # if
+assert_source_completions gcc
diff --git a/test/completion/gcj.exp b/test/completion/gcj.exp
index ca32ab6..88ca9ff 100644
--- a/test/completion/gcj.exp
+++ b/test/completion/gcj.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gcc}]} {
-    source "lib/completions/gcj.exp"
-}; # if
+assert_source_completions gcj
diff --git a/test/completion/gcl.exp b/test/completion/gcl.exp
index d83086f..ba2ff75 100644
--- a/test/completion/gcl.exp
+++ b/test/completion/gcl.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gcl}]} {
-    source "lib/completions/gcl.exp"
-}; # if
+assert_source_completions gcl
diff --git a/test/completion/gdb.exp b/test/completion/gdb.exp
index 0612dea..2b09307 100644
--- a/test/completion/gdb.exp
+++ b/test/completion/gdb.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gdb}]} {
-    source "lib/completions/gdb.exp"
-}; # if
+assert_source_completions gdb
diff --git a/test/completion/genaliases.exp b/test/completion/genaliases.exp
index 74ec3d4..eeee394 100644
--- a/test/completion/genaliases.exp
+++ b/test/completion/genaliases.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {genaliases}]} {
-    source "lib/completions/genaliases.exp"
-}; # if
+assert_source_completions genaliases
diff --git a/test/completion/getent.exp b/test/completion/getent.exp
index 6cdb798..9abcfbb 100644
--- a/test/completion/getent.exp
+++ b/test/completion/getent.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {getent}]} {
-    source "lib/completions/getent.exp"
-}; # if
+assert_source_completions getent
diff --git a/test/completion/gkrellm.exp b/test/completion/gkrellm.exp
index e244392..55422a0 100644
--- a/test/completion/gkrellm.exp
+++ b/test/completion/gkrellm.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gkrellm}]} {
-    source "lib/completions/gkrellm.exp"
-}; # if
+assert_source_completions gkrellm
diff --git a/test/completion/gmplayer.exp b/test/completion/gmplayer.exp
index a37fad4..0cea91c 100644
--- a/test/completion/gmplayer.exp
+++ b/test/completion/gmplayer.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {mplayer}]} {
-    source "lib/completions/gmplayer.exp"
-}; # if
+assert_source_completions gmplayer
diff --git a/test/completion/gnatmake.exp b/test/completion/gnatmake.exp
index ab0dbc3..eebb3c0 100644
--- a/test/completion/gnatmake.exp
+++ b/test/completion/gnatmake.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gnatmake}]} {
-    source "lib/completions/gnatmake.exp"
-}; # if
+assert_source_completions gnatmake
diff --git a/test/completion/gpc.exp b/test/completion/gpc.exp
index e362c01..d7fdb9e 100644
--- a/test/completion/gpc.exp
+++ b/test/completion/gpc.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gcc}]} {
-    source "lib/completions/gpc.exp"
-}; # if
+assert_source_completions gpc
diff --git a/test/completion/gperf.exp b/test/completion/gperf.exp
index 527425a..2b87d66 100644
--- a/test/completion/gperf.exp
+++ b/test/completion/gperf.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gperf}]} {
-    source "lib/completions/gperf.exp"
-}; # if
+assert_source_completions gperf
diff --git a/test/completion/gpg.exp b/test/completion/gpg.exp
index 64284d3..694f5f8 100644
--- a/test/completion/gpg.exp
+++ b/test/completion/gpg.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gpg}]} {
-    source "lib/completions/gpg.exp"
-}; # if
+assert_source_completions gpg
diff --git a/test/completion/gprof.exp b/test/completion/gprof.exp
index cf7c62c..c63cc28 100644
--- a/test/completion/gprof.exp
+++ b/test/completion/gprof.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gprof}]} {
-    source "lib/completions/gprof.exp"
-}; # if
+assert_source_completions gprof
diff --git a/test/completion/grep.exp b/test/completion/grep.exp
index 4f05366..945c345 100644
--- a/test/completion/grep.exp
+++ b/test/completion/grep.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {grep}]} {
-    source "lib/completions/grep.exp"
-}; # if
+assert_source_completions grep
diff --git a/test/completion/grub.exp b/test/completion/grub.exp
index 7cf2595..d50bf75 100644
--- a/test/completion/grub.exp
+++ b/test/completion/grub.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {grub}]} {
-    source "lib/completions/grub.exp"
-}; # if
+assert_source_completions grub
diff --git a/test/completion/gzip.exp b/test/completion/gzip.exp
index 78af4f0..e2a31c5 100644
--- a/test/completion/gzip.exp
+++ b/test/completion/gzip.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {gzip}]} {
-    source "lib/completions/gzip.exp"
-}; # if
+assert_source_completions gzip
diff --git a/test/completion/head.exp b/test/completion/head.exp
index fe064ac..49235c2 100644
--- a/test/completion/head.exp
+++ b/test/completion/head.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {head}]} {
-    source "lib/completions/head.exp"
-}; # if
+assert_source_completions head
diff --git a/test/completion/iconv.exp b/test/completion/iconv.exp
index 8e21c8a..c4c5fb6 100644
--- a/test/completion/iconv.exp
+++ b/test/completion/iconv.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {iconv}]} {
-    source "lib/completions/iconv.exp"
-}; # if
+assert_source_completions iconv
diff --git a/test/completion/id.exp b/test/completion/id.exp
index e5b963e..a4f81c8 100644
--- a/test/completion/id.exp
+++ b/test/completion/id.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {id}]} {
-    source "lib/completions/id.exp"
-}; # if
+assert_source_completions id
diff --git a/test/completion/identify.exp b/test/completion/identify.exp
index ed4197e..59bd9d6 100644
--- a/test/completion/identify.exp
+++ b/test/completion/identify.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {convert}]} {
-    source "lib/completions/identify.exp"
-}; # if
+assert_source_completions identify
diff --git a/test/completion/ifdown.exp b/test/completion/ifdown.exp
index ca83edb..f3f1a69 100644
--- a/test/completion/ifdown.exp
+++ b/test/completion/ifdown.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {ifdown}]} {
-    source "lib/completions/ifdown.exp"
-}; # if
+assert_source_completions ifdown
diff --git a/test/completion/ifup.exp b/test/completion/ifup.exp
index 5018e6e..780794b 100644
--- a/test/completion/ifup.exp
+++ b/test/completion/ifup.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {ifup}]} {
-    source "lib/completions/ifup.exp"
-}; # if
+assert_source_completions ifup
diff --git a/test/completion/indent.exp b/test/completion/indent.exp
index d618f90..91eae72 100644
--- a/test/completion/indent.exp
+++ b/test/completion/indent.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {indent}]} {
-    source "lib/completions/indent.exp"
-}; # if
+assert_source_completions indent
diff --git a/test/completion/info.exp b/test/completion/info.exp
index 82a9328..d16830b 100644
--- a/test/completion/info.exp
+++ b/test/completion/info.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {info}]} {
-    source "lib/completions/info.exp"
-}; # if
+assert_source_completions info
diff --git a/test/completion/inject.exp b/test/completion/inject.exp
index af6bc61..c2a18a4 100644
--- a/test/completion/inject.exp
+++ b/test/completion/inject.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {inject}]} {
-    source "lib/completions/inject.exp"
-}; # if
+assert_source_completions inject
diff --git a/test/completion/insmod.exp b/test/completion/insmod.exp
index e86b6ce..9aab37c 100644
--- a/test/completion/insmod.exp
+++ b/test/completion/insmod.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {insmod}]} {
-    source "lib/completions/insmod.exp"
-}; # if
+assert_source_completions insmod
diff --git a/test/completion/invoke-rc.d.exp b/test/completion/invoke-rc.d.exp
index 6540317..0198d10 100644
--- a/test/completion/invoke-rc.d.exp
+++ b/test/completion/invoke-rc.d.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {invoke-rc.d}]} {
-    source "lib/completions/invoke-rc.d.exp"
-}; # if
+assert_source_completions invoke-rc.d
diff --git a/test/completion/ipv6calc.exp b/test/completion/ipv6calc.exp
index 5a8966f..b1c3c18 100644
--- a/test/completion/ipv6calc.exp
+++ b/test/completion/ipv6calc.exp
@@ -1,3 +1 @@
-if {[assert_bash_type ipv6calc]} {
-    source "lib/completions/ipv6calc.exp"
-}; # if
+assert_source_completions ipv6calc
diff --git a/test/completion/irb.exp b/test/completion/irb.exp
index e621b78..02f166f 100644
--- a/test/completion/irb.exp
+++ b/test/completion/irb.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {irb}]} {
-    source "lib/completions/irb.exp"
-}; # if
+assert_source_completions irb
diff --git a/test/completion/isql.exp b/test/completion/isql.exp
index 7cd318c..d06295b 100644
--- a/test/completion/isql.exp
+++ b/test/completion/isql.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {isql}]} {
-    source "lib/completions/isql.exp"
-}; # if
+assert_source_completions isql
diff --git a/test/completion/iwconfig.exp b/test/completion/iwconfig.exp
index 8530e05..d3935e6 100644
--- a/test/completion/iwconfig.exp
+++ b/test/completion/iwconfig.exp
@@ -1,3 +1 @@
-if {[assert_bash_type iwconfig]} {
-    source "lib/completions/iwconfig.exp"
-}; # if
+assert_source_completions iwconfig
diff --git a/test/completion/iwlist.exp b/test/completion/iwlist.exp
index e5386fa..5293e3b 100644
--- a/test/completion/iwlist.exp
+++ b/test/completion/iwlist.exp
@@ -1,3 +1 @@
-if {[assert_bash_type iwlist]} {
-    source "lib/completions/iwlist.exp"
-}; # if
+assert_source_completions iwlist
diff --git a/test/completion/iwpriv.exp b/test/completion/iwpriv.exp
index 4234394..5caa841 100644
--- a/test/completion/iwpriv.exp
+++ b/test/completion/iwpriv.exp
@@ -1,3 +1 @@
-if {[assert_bash_type iwpriv]} {
-    source "lib/completions/iwpriv.exp"
-}; # if
+assert_source_completions iwpriv
diff --git a/test/completion/iwspy.exp b/test/completion/iwspy.exp
index 31e361d..08476d3 100644
--- a/test/completion/iwspy.exp
+++ b/test/completion/iwspy.exp
@@ -1,3 +1 @@
-if {[assert_bash_type iwspy]} {
-    source "lib/completions/iwspy.exp"
-}; # if
+assert_source_completions iwspy
diff --git a/test/completion/jarsigner.exp b/test/completion/jarsigner.exp
index 2967267..21b84fe 100644
--- a/test/completion/jarsigner.exp
+++ b/test/completion/jarsigner.exp
@@ -1,3 +1 @@
-if {[assert_bash_type jarsigner]} {
-    source "lib/completions/jarsigner.exp"
-}; # if
+assert_source_completions jarsigner
diff --git a/test/completion/java.exp b/test/completion/java.exp
index 4e412da..fbea3c3 100644
--- a/test/completion/java.exp
+++ b/test/completion/java.exp
@@ -1,3 +1 @@
-if {[assert_bash_type java]} {
-    source "lib/completions/java.exp"
-}; # if
+assert_source_completions java
diff --git a/test/completion/javac.exp b/test/completion/javac.exp
index 0b8de5f..1bc9403 100644
--- a/test/completion/javac.exp
+++ b/test/completion/javac.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {javac}]} {
-    source "lib/completions/javac.exp"
-}; # if
+assert_source_completions javac
diff --git a/test/completion/javadoc.exp b/test/completion/javadoc.exp
index 995c92d..0fcca89 100644
--- a/test/completion/javadoc.exp
+++ b/test/completion/javadoc.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {javadoc}]} {
-    source "lib/completions/javadoc.exp"
-}; # if
+assert_source_completions javadoc
diff --git a/test/completion/k3b.exp b/test/completion/k3b.exp
index 8ea2952..6d71bbe 100644
--- a/test/completion/k3b.exp
+++ b/test/completion/k3b.exp
@@ -1,3 +1 @@
-if {[assert_bash_type k3b]} {
-    source "lib/completions/k3b.exp"
-}; # if
+assert_source_completions k3b
diff --git a/test/completion/kdvi.exp b/test/completion/kdvi.exp
index 37887d8..9f6aa66 100644
--- a/test/completion/kdvi.exp
+++ b/test/completion/kdvi.exp
@@ -1,3 +1 @@
-if {[assert_bash_type kdvi]} {
-    source "lib/completions/kdvi.exp"
-}; # if
+assert_source_completions kdvi
diff --git a/test/completion/kill.exp b/test/completion/kill.exp
index 6a8a717..98efb32 100644
--- a/test/completion/kill.exp
+++ b/test/completion/kill.exp
@@ -1,3 +1 @@
-if {[assert_bash_type kill]} {
-    source "lib/completions/kill.exp"
-}; # if
+assert_source_completions kill
diff --git a/test/completion/killall.exp b/test/completion/killall.exp
index 125ec38..8cf4fe5 100644
--- a/test/completion/killall.exp
+++ b/test/completion/killall.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {killall}]} {
-    source "lib/completions/killall.exp"
-}; # if
+assert_source_completions killall
diff --git a/test/completion/kldload.exp b/test/completion/kldload.exp
index 3d9daaa..23ad008 100644
--- a/test/completion/kldload.exp
+++ b/test/completion/kldload.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {kldload}]} {
-    source "lib/completions/kldload.exp"
-}; # if
+assert_source_completions kldload
diff --git a/test/completion/kldunload.exp b/test/completion/kldunload.exp
index 7c22ec4..26219f2 100644
--- a/test/completion/kldunload.exp
+++ b/test/completion/kldunload.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {kldunload}]} {
-    source "lib/completions/kldunload.exp"
-}; # if
+assert_source_completions kldunload
diff --git a/test/completion/kpdf.exp b/test/completion/kpdf.exp
index 2220c5f..d0a1774 100644
--- a/test/completion/kpdf.exp
+++ b/test/completion/kpdf.exp
@@ -1,3 +1 @@
-if {[assert_bash_type kpdf]} {
-    source "lib/completions/kpdf.exp"
-}; # if
+assert_source_completions kpdf
diff --git a/test/completion/kplayer.exp b/test/completion/kplayer.exp
index 1663f26..0812c04 100644
--- a/test/completion/kplayer.exp
+++ b/test/completion/kplayer.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {mplayer}]} {
-    source "lib/completions/kplayer.exp"
-}; # if
+assert_source_completions kplayer
diff --git a/test/completion/larch.exp b/test/completion/larch.exp
index 26aef71..ccf332e 100644
--- a/test/completion/larch.exp
+++ b/test/completion/larch.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {larch}]} {
-    source "lib/completions/larch.exp"
-}; # if
+assert_source_completions larch
diff --git a/test/completion/ld.exp b/test/completion/ld.exp
index 9252790..fcbc43d 100644
--- a/test/completion/ld.exp
+++ b/test/completion/ld.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {ld}]} {
-    source "lib/completions/ld.exp"
-}; # if
+assert_source_completions ld
diff --git a/test/completion/ldd.exp b/test/completion/ldd.exp
index 20c6fec..af175be 100644
--- a/test/completion/ldd.exp
+++ b/test/completion/ldd.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {ldd}]} {
-    source "lib/completions/ldd.exp"
-}; # if
+assert_source_completions ldd
diff --git a/test/completion/less.exp b/test/completion/less.exp
index 7ef1157..1a18c81 100644
--- a/test/completion/less.exp
+++ b/test/completion/less.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {less}]} {
-    source "lib/completions/less.exp"
-}; # if
+assert_source_completions less
diff --git a/test/completion/lftp.exp b/test/completion/lftp.exp
index 847c6b3..90f307b 100644
--- a/test/completion/lftp.exp
+++ b/test/completion/lftp.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {lftp}]} {
-    source "lib/completions/lftp.exp"
-}; # if
+assert_source_completions lftp
diff --git a/test/completion/lftpget.exp b/test/completion/lftpget.exp
index c5df3a8..26c40cb 100644
--- a/test/completion/lftpget.exp
+++ b/test/completion/lftpget.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {lftpget}]} {
-    source "lib/completions/lftpget.exp"
-}; # if
+assert_source_completions lftpget
diff --git a/test/completion/lilo.exp b/test/completion/lilo.exp
index 340509b..9407636 100644
--- a/test/completion/lilo.exp
+++ b/test/completion/lilo.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {lilo}]} {
-    source "lib/completions/lilo.exp"
-}; # if
+assert_source_completions lilo
diff --git a/test/completion/links.exp b/test/completion/links.exp
index 7e87130..36af0dd 100644
--- a/test/completion/links.exp
+++ b/test/completion/links.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {links}]} {
-    source "lib/completions/links.exp"
-}; # if
+assert_source_completions links
diff --git a/test/completion/lisp.exp b/test/completion/lisp.exp
index 90ac94f..f531d8e 100644
--- a/test/completion/lisp.exp
+++ b/test/completion/lisp.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {lisp}]} {
-    source "lib/completions/lisp.exp"
-}; # if
+assert_source_completions lisp
diff --git a/test/completion/list_admins.exp b/test/completion/list_admins.exp
index 8a39e12..17d9f57 100644
--- a/test/completion/list_admins.exp
+++ b/test/completion/list_admins.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {list_admins}]} {
-    source "lib/completions/list_admins.exp"
-}; # if
+assert_source_completions list_admins
diff --git a/test/completion/list_lists.exp b/test/completion/list_lists.exp
index eb38985..28a381c 100644
--- a/test/completion/list_lists.exp
+++ b/test/completion/list_lists.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {list_lists}]} {
-    source "lib/completions/list_lists.exp"
-}; # if
+assert_source_completions list_lists
diff --git a/test/completion/list_members.exp b/test/completion/list_members.exp
index bc6a663..89b6e1e 100644
--- a/test/completion/list_members.exp
+++ b/test/completion/list_members.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {list_members}]} {
-    source "lib/completions/list_members.exp"
-}; # if
+assert_source_completions list_members
diff --git a/test/completion/list_owners.exp b/test/completion/list_owners.exp
index 0b02658..88262b0 100644
--- a/test/completion/list_owners.exp
+++ b/test/completion/list_owners.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {list_owners}]} {
-    source "lib/completions/list_owners.exp"
-}; # if
+assert_source_completions list_owners
diff --git a/test/completion/ln.exp b/test/completion/ln.exp
index cd4b605..db4fe38 100644
--- a/test/completion/ln.exp
+++ b/test/completion/ln.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {ln}]} {
-    source "lib/completions/ln.exp"
-}; # if
+assert_source_completions ln
diff --git a/test/completion/look.exp b/test/completion/look.exp
index c99369b..3a781af 100644
--- a/test/completion/look.exp
+++ b/test/completion/look.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {look}]} {
-    source "lib/completions/look.exp"
-}; # if
+assert_source_completions look
diff --git a/test/completion/ls.exp b/test/completion/ls.exp
index e1fe643..c98d346 100644
--- a/test/completion/ls.exp
+++ b/test/completion/ls.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {ls}]} {
-    source "lib/completions/ls.exp"
-}; # if
+assert_source_completions ls
diff --git a/test/completion/lvchange.exp b/test/completion/lvchange.exp
index 15d5e26..400a6c5 100644
--- a/test/completion/lvchange.exp
+++ b/test/completion/lvchange.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvchange]} {
-    source "lib/completions/lvchange.exp"
-}; # if
+assert_source_completions lvchange
diff --git a/test/completion/lvcreate.exp b/test/completion/lvcreate.exp
index 0687908..f211c6d 100644
--- a/test/completion/lvcreate.exp
+++ b/test/completion/lvcreate.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvcreate]} {
-    source "lib/completions/lvcreate.exp"
-}; # if
+assert_source_completions lvcreate
diff --git a/test/completion/lvdisplay.exp b/test/completion/lvdisplay.exp
index 112e223..0d4540b 100644
--- a/test/completion/lvdisplay.exp
+++ b/test/completion/lvdisplay.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvdisplay]} {
-    source "lib/completions/lvdisplay.exp"
-}; # if
+assert_source_completions lvdisplay
diff --git a/test/completion/lvextend.exp b/test/completion/lvextend.exp
index 023c97a..84c1b52 100644
--- a/test/completion/lvextend.exp
+++ b/test/completion/lvextend.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvextend]} {
-    source "lib/completions/lvextend.exp"
-}; # if
+assert_source_completions lvextend
diff --git a/test/completion/lvm.exp b/test/completion/lvm.exp
index b5cc2fe..ff3e80f 100644
--- a/test/completion/lvm.exp
+++ b/test/completion/lvm.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvm]} {
-    source "lib/completions/lvm.exp"
-}; # if
+assert_source_completions lvm
diff --git a/test/completion/lvmdiskscan.exp b/test/completion/lvmdiskscan.exp
index d5c84cd..c1f4f5f 100644
--- a/test/completion/lvmdiskscan.exp
+++ b/test/completion/lvmdiskscan.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvmdiskscan]} {
-    source "lib/completions/lvmdiskscan.exp"
-}; # if
+assert_source_completions lvmdiskscan
diff --git a/test/completion/lvreduce.exp b/test/completion/lvreduce.exp
index f44af76..c9cd873 100644
--- a/test/completion/lvreduce.exp
+++ b/test/completion/lvreduce.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvreduce]} {
-    source "lib/completions/lvreduce.exp"
-}; # if
+assert_source_completions lvreduce
diff --git a/test/completion/lvremove.exp b/test/completion/lvremove.exp
index 1f335e9..475202f 100644
--- a/test/completion/lvremove.exp
+++ b/test/completion/lvremove.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvremove]} {
-    source "lib/completions/lvremove.exp"
-}; # if
+assert_source_completions lvremove
diff --git a/test/completion/lvrename.exp b/test/completion/lvrename.exp
index a3e126c..32e7f62 100644
--- a/test/completion/lvrename.exp
+++ b/test/completion/lvrename.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvrename]} {
-    source "lib/completions/lvrename.exp"
-}; # if
+assert_source_completions lvrename
diff --git a/test/completion/lvresize.exp b/test/completion/lvresize.exp
index 0246ffc..dd05dbd 100644
--- a/test/completion/lvresize.exp
+++ b/test/completion/lvresize.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvresize]} {
-    source "lib/completions/lvresize.exp"
-}; # if
+assert_source_completions lvresize
diff --git a/test/completion/lvs.exp b/test/completion/lvs.exp
index f6a2124..796c8b2 100644
--- a/test/completion/lvs.exp
+++ b/test/completion/lvs.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvs]} {
-    source "lib/completions/lvs.exp"
-}; # if
+assert_source_completions lvs
diff --git a/test/completion/lvscan.exp b/test/completion/lvscan.exp
index 03992b1..549c9fd 100644
--- a/test/completion/lvscan.exp
+++ b/test/completion/lvscan.exp
@@ -1,3 +1 @@
-if {[assert_bash_type lvscan]} {
-    source "lib/completions/lvscan.exp"
-}; # if
+assert_source_completions lvscan
diff --git a/test/completion/m4.exp b/test/completion/m4.exp
index e1af46b..475fb9a 100644
--- a/test/completion/m4.exp
+++ b/test/completion/m4.exp
@@ -1,3 +1 @@
-if {[assert_bash_type m4]} {
-    source "lib/completions/m4.exp"
-}; # if
+assert_source_completions m4
diff --git a/test/completion/macof.exp b/test/completion/macof.exp
index 47b846f..0942c21 100644
--- a/test/completion/macof.exp
+++ b/test/completion/macof.exp
@@ -1,3 +1 @@
-if {[assert_bash_type macof]} {
-    source "lib/completions/macof.exp"
-}; # if
+assert_source_completions macof
diff --git a/test/completion/mailmanctl.exp b/test/completion/mailmanctl.exp
index 4a95fcd..2784b27 100644
--- a/test/completion/mailmanctl.exp
+++ b/test/completion/mailmanctl.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mailmanctl]} {
-    source "lib/completions/mailmanctl.exp"
-}; # if
+assert_source_completions mailmanctl
diff --git a/test/completion/mailsnarf.exp b/test/completion/mailsnarf.exp
index 91dfab5..c3e20e2 100644
--- a/test/completion/mailsnarf.exp
+++ b/test/completion/mailsnarf.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mailsnarf]} {
-    source "lib/completions/mailsnarf.exp"
-}; # if
+assert_source_completions mailsnarf
diff --git a/test/completion/make.exp b/test/completion/make.exp
index 1a1d59f..483c7fe 100644
--- a/test/completion/make.exp
+++ b/test/completion/make.exp
@@ -1,3 +1 @@
-if {[assert_bash_type make]} {
-    source "lib/completions/make.exp"
-}; # if
+assert_source_completions make
diff --git a/test/completion/man.exp b/test/completion/man.exp
index 9b33719..7bae8c0 100644
--- a/test/completion/man.exp
+++ b/test/completion/man.exp
@@ -1,3 +1 @@
-if {[assert_bash_type man]} {
-    source "lib/completions/man.exp"
-}; # if
+assert_source_completions man
diff --git a/test/completion/mc.exp b/test/completion/mc.exp
index ae83378..37471b4 100644
--- a/test/completion/mc.exp
+++ b/test/completion/mc.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mc]} {
-    source "lib/completions/mc.exp"
-}; # if
+assert_source_completions mc
diff --git a/test/completion/mcrypt.exp b/test/completion/mcrypt.exp
index 79812dc..086b058 100644
--- a/test/completion/mcrypt.exp
+++ b/test/completion/mcrypt.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mcrypt]} {
-    source "lib/completions/mcrypt.exp"
-}; # if
+assert_source_completions mcrypt
diff --git a/test/completion/md5sum.exp b/test/completion/md5sum.exp
index 415af3a..3378b37 100644
--- a/test/completion/md5sum.exp
+++ b/test/completion/md5sum.exp
@@ -1,3 +1 @@
-if {[assert_bash_type md5sum]} {
-    source "lib/completions/md5sum.exp"
-}; # if
+assert_source_completions md5sum
diff --git a/test/completion/mdecrypt.exp b/test/completion/mdecrypt.exp
index 79c7868..daab219 100644
--- a/test/completion/mdecrypt.exp
+++ b/test/completion/mdecrypt.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mdecrypt]} {
-    source "lib/completions/mdecrypt.exp"
-}; # if
+assert_source_completions mdecrypt
diff --git a/test/completion/mencoder.exp b/test/completion/mencoder.exp
index 5a2a3dd..6c4fa23 100644
--- a/test/completion/mencoder.exp
+++ b/test/completion/mencoder.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mencoder]} {
-    source "lib/completions/mencoder.exp"
-}; # if
+assert_source_completions mencoder
diff --git a/test/completion/minicom.exp b/test/completion/minicom.exp
index 86e278d..cef598e 100644
--- a/test/completion/minicom.exp
+++ b/test/completion/minicom.exp
@@ -1,3 +1 @@
-if {[assert_bash_type minicom]} {
-    source "lib/completions/minicom.exp"
-}; # if
+assert_source_completions minicom
diff --git a/test/completion/mkdir.exp b/test/completion/mkdir.exp
index ada8048..f4bad3b 100644
--- a/test/completion/mkdir.exp
+++ b/test/completion/mkdir.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mkdir]} {
-    source "lib/completions/mkdir.exp"
-}; # if
+assert_source_completions mkdir
diff --git a/test/completion/mkfifo.exp b/test/completion/mkfifo.exp
index 22038e2..706b36f 100644
--- a/test/completion/mkfifo.exp
+++ b/test/completion/mkfifo.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mkfifo]} {
-    source "lib/completions/mkfifo.exp"
-}; # if
+assert_source_completions mkfifo
diff --git a/test/completion/mkinitrd.exp b/test/completion/mkinitrd.exp
index 9b55cfc..e8f4e11 100644
--- a/test/completion/mkinitrd.exp
+++ b/test/completion/mkinitrd.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mkinitrd]} {
-    source "lib/completions/mkinitrd.exp"
-}; # if
+assert_source_completions mkinitrd
diff --git a/test/completion/mkisofs.exp b/test/completion/mkisofs.exp
index f8303a6..a94d833 100644
--- a/test/completion/mkisofs.exp
+++ b/test/completion/mkisofs.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {mkisofs}]} {
-    source "lib/completions/mkisofs.exp"
-}; # if
+assert_source_completions mkisofs
diff --git a/test/completion/mknod.exp b/test/completion/mknod.exp
index f8b803e..89f0cef 100644
--- a/test/completion/mknod.exp
+++ b/test/completion/mknod.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mknod]} {
-    source "lib/completions/mknod.exp"
-}; # if
+assert_source_completions mknod
diff --git a/test/completion/mmsitepass.exp b/test/completion/mmsitepass.exp
index dc35391..c54c53b 100644
--- a/test/completion/mmsitepass.exp
+++ b/test/completion/mmsitepass.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mmsitepass]} {
-    source "lib/completions/mmsitepass.exp"
-}; # if
+assert_source_completions mmsitepass
diff --git a/test/completion/module.exp b/test/completion/module.exp
index 9463f7f..3db6d11 100644
--- a/test/completion/module.exp
+++ b/test/completion/module.exp
@@ -1,3 +1 @@
-if {[assert_bash_type module]} {
-    source "lib/completions/module.exp"
-}; # if
+assert_source_completions module
diff --git a/test/completion/mogrify.exp b/test/completion/mogrify.exp
index 9f68eac..ad3ff02 100644
--- a/test/completion/mogrify.exp
+++ b/test/completion/mogrify.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mogrify]} {
-    source "lib/completions/mogrify.exp"
-}; # if
+assert_source_completions mogrify
diff --git a/test/completion/montage.exp b/test/completion/montage.exp
index cb216f2..afb11ad 100644
--- a/test/completion/montage.exp
+++ b/test/completion/montage.exp
@@ -1,3 +1 @@
-if {[assert_bash_type montage]} {
-    source "lib/completions/montage.exp"
-}; # if
+assert_source_completions montage
diff --git a/test/completion/mount.exp b/test/completion/mount.exp
index c1f89ce..2561e20 100644
--- a/test/completion/mount.exp
+++ b/test/completion/mount.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mount]} {
-    source "lib/completions/mount.exp"
-}; # if
+assert_source_completions mount
diff --git a/test/completion/mplayer.exp b/test/completion/mplayer.exp
index 6d46097..5c38af8 100644
--- a/test/completion/mplayer.exp
+++ b/test/completion/mplayer.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mplayer]} {
-    source "lib/completions/mplayer.exp"
-}; # if
+assert_source_completions mplayer
diff --git a/test/completion/msgsnarf.exp b/test/completion/msgsnarf.exp
index 1ba9e36..cdcbf43 100644
--- a/test/completion/msgsnarf.exp
+++ b/test/completion/msgsnarf.exp
@@ -1,3 +1 @@
-if {[assert_bash_type msgsnarf]} {
-    source "lib/completions/msgsnarf.exp"
-}; # if
+assert_source_completions msgsnarf
diff --git a/test/completion/mtx.exp b/test/completion/mtx.exp
index 3b3dd35..6be7a2f 100644
--- a/test/completion/mtx.exp
+++ b/test/completion/mtx.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mtx]} {
-    source "lib/completions/mtx.exp"
-}; # if
+assert_source_completions mtx
diff --git a/test/completion/mutt.exp b/test/completion/mutt.exp
index 6c56cf0..5fb8c33 100644
--- a/test/completion/mutt.exp
+++ b/test/completion/mutt.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mutt]} {
-    source "lib/completions/mutt.exp"
-}; # if
+assert_source_completions mutt
diff --git a/test/completion/muttng.exp b/test/completion/muttng.exp
index 0cf5073..b06b574 100644
--- a/test/completion/muttng.exp
+++ b/test/completion/muttng.exp
@@ -1,3 +1 @@
-if {[assert_bash_type muttng]} {
-    source "lib/completions/muttng.exp"
-}; # if
+assert_source_completions muttng
diff --git a/test/completion/mv.exp b/test/completion/mv.exp
index 9757600..b7d2276 100644
--- a/test/completion/mv.exp
+++ b/test/completion/mv.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mv]} {
-    source "lib/completions/mv.exp"
-}; # if
+assert_source_completions mv
diff --git a/test/completion/mysqladmin.exp b/test/completion/mysqladmin.exp
index 4d7fe71..61769d2 100644
--- a/test/completion/mysqladmin.exp
+++ b/test/completion/mysqladmin.exp
@@ -1,3 +1 @@
-if {[assert_bash_type mysqladmin]} {
-    source "lib/completions/mysqladmin.exp"
-}; # if
+assert_source_completions mysqladmin
diff --git a/test/completion/ncftp.exp b/test/completion/ncftp.exp
index 3e3fe2d..c5db3f9 100644
--- a/test/completion/ncftp.exp
+++ b/test/completion/ncftp.exp
@@ -1,3 +1 @@
-if {[assert_bash_type ncftp]} {
-    source "lib/completions/ncftp.exp"
-}; # if
+assert_source_completions ncftp
diff --git a/test/completion/netstat.exp b/test/completion/netstat.exp
index a3084f1..bee9278 100644
--- a/test/completion/netstat.exp
+++ b/test/completion/netstat.exp
@@ -1,3 +1 @@
-if {[assert_bash_type netstat]} {
-    source "lib/completions/netstat.exp"
-}; # if
+assert_source_completions netstat
diff --git a/test/completion/newlist.exp b/test/completion/newlist.exp
index dcc9d09..ac05a92 100644
--- a/test/completion/newlist.exp
+++ b/test/completion/newlist.exp
@@ -1,3 +1 @@
-if {[assert_bash_type newlist]} {
-    source "lib/completions/newlist.exp"
-}; # if
+assert_source_completions newlist
diff --git a/test/completion/nl.exp b/test/completion/nl.exp
index a64021b..c788a06 100644
--- a/test/completion/nl.exp
+++ b/test/completion/nl.exp
@@ -1,3 +1 @@
-if {[assert_bash_type nl]} {
-    source "lib/completions/nl.exp"
-}; # if
+assert_source_completions nl
diff --git a/test/completion/nm.exp b/test/completion/nm.exp
index 48e8430..99ccd37 100644
--- a/test/completion/nm.exp
+++ b/test/completion/nm.exp
@@ -1,3 +1 @@
-if {[assert_bash_type nm]} {
-    source "lib/completions/nm.exp"
-}; # if
+assert_source_completions nm
diff --git a/test/completion/ntpdate.exp b/test/completion/ntpdate.exp
index c7f965e..d40bbd7 100644
--- a/test/completion/ntpdate.exp
+++ b/test/completion/ntpdate.exp
@@ -1,3 +1 @@
-if {[assert_bash_type ntpdate]} {
-    source "lib/completions/ntpdate.exp"
-}; # if
+assert_source_completions ntpdate
diff --git a/test/completion/objcopy.exp b/test/completion/objcopy.exp
index 1bfda5a..579d9ba 100644
--- a/test/completion/objcopy.exp
+++ b/test/completion/objcopy.exp
@@ -1,3 +1 @@
-if {[assert_bash_type objcopy]} {
-    source "lib/completions/objcopy.exp"
-}; # if
+assert_source_completions objcopy
diff --git a/test/completion/objdump.exp b/test/completion/objdump.exp
index b617b15..7868984 100644
--- a/test/completion/objdump.exp
+++ b/test/completion/objdump.exp
@@ -1,3 +1 @@
-if {[assert_bash_type objdump]} {
-    source "lib/completions/objdump.exp"
-}; # if
+assert_source_completions objdump
diff --git a/test/completion/od.exp b/test/completion/od.exp
index cb85411..e9ec0f8 100644
--- a/test/completion/od.exp
+++ b/test/completion/od.exp
@@ -1,3 +1 @@
-if {[assert_bash_type od]} {
-    source "lib/completions/od.exp"
-}; # if
+assert_source_completions od
diff --git a/test/completion/openssl.exp b/test/completion/openssl.exp
index 5c09575..281cbf9 100644
--- a/test/completion/openssl.exp
+++ b/test/completion/openssl.exp
@@ -1,3 +1 @@
-if {[assert_bash_type openssl]} {
-    source "lib/completions/openssl.exp"
-}; # if
+assert_source_completions openssl
diff --git a/test/completion/p4.exp b/test/completion/p4.exp
index d261ee0..9301a04 100644
--- a/test/completion/p4.exp
+++ b/test/completion/p4.exp
@@ -1,3 +1 @@
-if {[assert_bash_type p4]} {
-    source "lib/completions/p4.exp"
-}; # if
+assert_source_completions p4
diff --git a/test/completion/pack200.exp b/test/completion/pack200.exp
index db43532..b20f817 100644
--- a/test/completion/pack200.exp
+++ b/test/completion/pack200.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pack200]} {
-    source "lib/completions/pack200.exp"
-}; # if
+assert_source_completions pack200
diff --git a/test/completion/paste.exp b/test/completion/paste.exp
index 3358b9f..ab2f124 100644
--- a/test/completion/paste.exp
+++ b/test/completion/paste.exp
@@ -1,3 +1 @@
-if {[assert_bash_type paste]} {
-    source "lib/completions/paste.exp"
-}; # if
+assert_source_completions paste
diff --git a/test/completion/patch.exp b/test/completion/patch.exp
index a8b9b76..27d6936 100644
--- a/test/completion/patch.exp
+++ b/test/completion/patch.exp
@@ -1,3 +1 @@
-if {[assert_bash_type patch]} {
-    source "lib/completions/patch.exp"
-}; # if
+assert_source_completions patch
diff --git a/test/completion/perl.exp b/test/completion/perl.exp
index 496d4db..617a7b1 100644
--- a/test/completion/perl.exp
+++ b/test/completion/perl.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {perl}]} {
-    source "lib/completions/perl.exp"
-}; # if
+assert_source_completions perl
diff --git a/test/completion/pine.exp b/test/completion/pine.exp
index 108b0cc..635d79b 100644
--- a/test/completion/pine.exp
+++ b/test/completion/pine.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pine]} {
-    source "lib/completions/pine.exp"
-}; # if
+assert_source_completions pine
diff --git a/test/completion/ping.exp b/test/completion/ping.exp
index 994751b..f006ea2 100644
--- a/test/completion/ping.exp
+++ b/test/completion/ping.exp
@@ -1,3 +1 @@
-if {[assert_bash_type ping]} {
-    source "lib/completions/ping.exp"
-}; # if
+assert_source_completions ping
diff --git a/test/completion/pkg-config.exp b/test/completion/pkg-config.exp
index f563e84..03d8dc4 100644
--- a/test/completion/pkg-config.exp
+++ b/test/completion/pkg-config.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pkg-config]} {
-    source "lib/completions/pkg-config.exp"
-}; # if
+assert_source_completions pkg-config
diff --git a/test/completion/pkg_deinstall.exp b/test/completion/pkg_deinstall.exp
index 67b0a7e..e7a666c 100644
--- a/test/completion/pkg_deinstall.exp
+++ b/test/completion/pkg_deinstall.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pkg_deinstall]} {
-    source "lib/completions/pkg_deinstall.exp"
-}; # if
+assert_source_completions pkg_deinstall
diff --git a/test/completion/pkg_delete.exp b/test/completion/pkg_delete.exp
index d90eca2..f66049e 100644
--- a/test/completion/pkg_delete.exp
+++ b/test/completion/pkg_delete.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pkg_delete]} {
-    source "lib/completions/pkg_delete.exp"
-}; # if
+assert_source_completions pkg_delete
diff --git a/test/completion/pkg_info.exp b/test/completion/pkg_info.exp
index 1a7fe00..e5387cd 100644
--- a/test/completion/pkg_info.exp
+++ b/test/completion/pkg_info.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pkg_info]} {
-    source "lib/completions/pkg_info.exp"
-}; # if
+assert_source_completions pkg_info
diff --git a/test/completion/portinstall.exp b/test/completion/portinstall.exp
index fa6fc8b..87fb596 100644
--- a/test/completion/portinstall.exp
+++ b/test/completion/portinstall.exp
@@ -1,3 +1 @@
-if {[assert_bash_type portinstall]} {
-    source "lib/completions/portinstall.exp"
-}; # if
+assert_source_completions portinstall
diff --git a/test/completion/portupgrade.exp b/test/completion/portupgrade.exp
index bc2e857..00e8d4d 100644
--- a/test/completion/portupgrade.exp
+++ b/test/completion/portupgrade.exp
@@ -1,3 +1 @@
-if {[assert_bash_type portupgrade]} {
-    source "lib/completions/portupgrade.exp"
-}; # if
+assert_source_completions portupgrade
diff --git a/test/completion/povray.exp b/test/completion/povray.exp
index 0c50f4f..4d49702 100644
--- a/test/completion/povray.exp
+++ b/test/completion/povray.exp
@@ -1,3 +1 @@
-if {[assert_bash_type povray]} {
-    source "lib/completions/povray.exp"
-}; # if
+assert_source_completions povray
diff --git a/test/completion/pr.exp b/test/completion/pr.exp
index de0884a..940bfe4 100644
--- a/test/completion/pr.exp
+++ b/test/completion/pr.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pr]} {
-    source "lib/completions/pr.exp"
-}; # if
+assert_source_completions pr
diff --git a/test/completion/psql.exp b/test/completion/psql.exp
index 86a3f29..619d9e1 100644
--- a/test/completion/psql.exp
+++ b/test/completion/psql.exp
@@ -1,3 +1 @@
-if {[assert_bash_type psql]} {
-    source "lib/completions/psql.exp"
-}; # if
+assert_source_completions psql
diff --git a/test/completion/ptx.exp b/test/completion/ptx.exp
index 75656a9..4ab752b 100644
--- a/test/completion/ptx.exp
+++ b/test/completion/ptx.exp
@@ -1,3 +1 @@
-if {[assert_bash_type ptx]} {
-    source "lib/completions/ptx.exp"
-}; # if
+assert_source_completions ptx
diff --git a/test/completion/pvchange.exp b/test/completion/pvchange.exp
index 9c5a432..d6f3536 100644
--- a/test/completion/pvchange.exp
+++ b/test/completion/pvchange.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pvchange]} {
-    source "lib/completions/pvchange.exp"
-}; # if
+assert_source_completions pvchange
diff --git a/test/completion/pvcreate.exp b/test/completion/pvcreate.exp
index 7bad2f5..1542baa 100644
--- a/test/completion/pvcreate.exp
+++ b/test/completion/pvcreate.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pvcreate]} {
-    source "lib/completions/pvcreate.exp"
-}; # if
+assert_source_completions pvcreate
diff --git a/test/completion/pvdisplay.exp b/test/completion/pvdisplay.exp
index b3e7e69..bcbcb58 100644
--- a/test/completion/pvdisplay.exp
+++ b/test/completion/pvdisplay.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pvdisplay]} {
-    source "lib/completions/pvdisplay.exp"
-}; # if
+assert_source_completions pvdisplay
diff --git a/test/completion/pvmove.exp b/test/completion/pvmove.exp
index e702247..4315193 100644
--- a/test/completion/pvmove.exp
+++ b/test/completion/pvmove.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pvmove]} {
-    source "lib/completions/pvmove.exp"
-}; # if
+assert_source_completions pvmove
diff --git a/test/completion/pvremove.exp b/test/completion/pvremove.exp
index cf753a2..3cc5976 100644
--- a/test/completion/pvremove.exp
+++ b/test/completion/pvremove.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pvremove]} {
-    source "lib/completions/pvremove.exp"
-}; # if
+assert_source_completions pvremove
diff --git a/test/completion/pvs.exp b/test/completion/pvs.exp
index f676f50..22dc03d 100644
--- a/test/completion/pvs.exp
+++ b/test/completion/pvs.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pvs]} {
-    source "lib/completions/pvs.exp"
-}; # if
+assert_source_completions pvs
diff --git a/test/completion/pvscan.exp b/test/completion/pvscan.exp
index 45e90df..22b02c7 100644
--- a/test/completion/pvscan.exp
+++ b/test/completion/pvscan.exp
@@ -1,3 +1 @@
-if {[assert_bash_type pvscan]} {
-    source "lib/completions/pvscan.exp"
-}; # if
+assert_source_completions pvscan
diff --git a/test/completion/python.exp b/test/completion/python.exp
index fd44bfb..2cb7390 100644
--- a/test/completion/python.exp
+++ b/test/completion/python.exp
@@ -1,3 +1 @@
-if {[assert_bash_type python]} {
-    source "lib/completions/python.exp"
-}; # if
+assert_source_completions python
diff --git a/test/completion/qrunner.exp b/test/completion/qrunner.exp
index 86ead6b..567dcb4 100644
--- a/test/completion/qrunner.exp
+++ b/test/completion/qrunner.exp
@@ -1,3 +1 @@
-if {[assert_bash_type qrunner]} {
-    source "lib/completions/qrunner.exp"
-}; # if
+assert_source_completions qrunner
diff --git a/test/completion/querybts.exp b/test/completion/querybts.exp
index 3699386..81203b2 100644
--- a/test/completion/querybts.exp
+++ b/test/completion/querybts.exp
@@ -1,3 +1 @@
-if {[assert_bash_type querybts]} {
-    source "lib/completions/querybts.exp"
-}; # if
+assert_source_completions querybts
diff --git a/test/completion/rcs.exp b/test/completion/rcs.exp
index 73c12fd..34b2119 100644
--- a/test/completion/rcs.exp
+++ b/test/completion/rcs.exp
@@ -1,3 +1 @@
-if {[assert_bash_type rcs]} {
-    source "lib/completions/rcs.exp"
-}; # if
+assert_source_completions rcs
diff --git a/test/completion/rcsdiff.exp b/test/completion/rcsdiff.exp
index 354bc2f..9cf52dc 100644
--- a/test/completion/rcsdiff.exp
+++ b/test/completion/rcsdiff.exp
@@ -1,3 +1 @@
-if {[assert_bash_type rcsdiff]} {
-    source "lib/completions/rcsdiff.exp"
-}; # if
+assert_source_completions rcsdiff
diff --git a/test/completion/rdict.exp b/test/completion/rdict.exp
index 5ce0143..cea99fb 100644
--- a/test/completion/rdict.exp
+++ b/test/completion/rdict.exp
@@ -1,3 +1 @@
-if {[assert_bash_type rdict]} {
-    source "lib/completions/rdict.exp"
-}; # if
+assert_source_completions rdict
diff --git a/test/completion/readelf.exp b/test/completion/readelf.exp
index 8b5f2f8..d0d9bc4 100644
--- a/test/completion/readelf.exp
+++ b/test/completion/readelf.exp
@@ -1,3 +1 @@
-if {[assert_bash_type readelf]} {
-    source "lib/completions/readelf.exp"
-}; # if
+assert_source_completions readelf
diff --git a/test/completion/readonly.exp b/test/completion/readonly.exp
index 635c549..f35b8e7 100644
--- a/test/completion/readonly.exp
+++ b/test/completion/readonly.exp
@@ -1,3 +1 @@
-if {[assert_bash_type readonly]} {
-    source "lib/completions/readonly.exp"
-}; # if
+assert_source_completions readonly
diff --git a/test/completion/remove_members.exp b/test/completion/remove_members.exp
index d911a3c..0cc71ac 100644
--- a/test/completion/remove_members.exp
+++ b/test/completion/remove_members.exp
@@ -1,3 +1 @@
-if {[assert_bash_type remove_members]} {
-    source "lib/completions/remove_members.exp"
-}; # if
+assert_source_completions remove_members
diff --git a/test/completion/removepkg.exp b/test/completion/removepkg.exp
index 5d4b9f9..e78e01a 100644
--- a/test/completion/removepkg.exp
+++ b/test/completion/removepkg.exp
@@ -1,3 +1 @@
-if {[assert_bash_type removepkg]} {
-    source "lib/completions/removepkg.exp"
-}; # if
+assert_source_completions removepkg
diff --git a/test/completion/renice.exp b/test/completion/renice.exp
index 0f0637b..e5d6c8e 100644
--- a/test/completion/renice.exp
+++ b/test/completion/renice.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {renice}]} {
-    source "lib/completions/renice.exp"
-}; # if
+assert_source_completions renice
diff --git a/test/completion/reportbug.exp b/test/completion/reportbug.exp
index 52419e9..10d6ceb 100644
--- a/test/completion/reportbug.exp
+++ b/test/completion/reportbug.exp
@@ -1,3 +1 @@
-if {[assert_bash_type reportbug]} {
-    source "lib/completions/reportbug.exp"
-}; # if
+assert_source_completions reportbug
diff --git a/test/completion/ri.exp b/test/completion/ri.exp
index f37203f..f93d340 100644
--- a/test/completion/ri.exp
+++ b/test/completion/ri.exp
@@ -1,3 +1 @@
-if {[assert_bash_type ri]} {
-    source "lib/completions/ri.exp"
-}; # if
+assert_source_completions ri
diff --git a/test/completion/rlog.exp b/test/completion/rlog.exp
index 1af971a..9af48c0 100644
--- a/test/completion/rlog.exp
+++ b/test/completion/rlog.exp
@@ -1,3 +1 @@
-if {[assert_bash_type rlog]} {
-    source "lib/completions/rlog.exp"
-}; # if
+assert_source_completions rlog
diff --git a/test/completion/rm.exp b/test/completion/rm.exp
index 069a0bc..6a99948 100644
--- a/test/completion/rm.exp
+++ b/test/completion/rm.exp
@@ -1,3 +1 @@
-if {[assert_bash_type rm]} {
-    source "lib/completions/rm.exp"
-}; # if
+assert_source_completions rm
diff --git a/test/completion/rmdir.exp b/test/completion/rmdir.exp
index 32c36c0..a7435b8 100644
--- a/test/completion/rmdir.exp
+++ b/test/completion/rmdir.exp
@@ -1,3 +1 @@
-if {[assert_bash_type rmdir]} {
-    source "lib/completions/rmdir.exp"
-}; # if
+assert_source_completions rmdir
diff --git a/test/completion/rmlist.exp b/test/completion/rmlist.exp
index 6efcc4b..ac4dd51 100644
--- a/test/completion/rmlist.exp
+++ b/test/completion/rmlist.exp
@@ -1,3 +1 @@
-if {[assert_bash_type rmlist]} {
-    source "lib/completions/rmlist.exp"
-}; # if
+assert_source_completions rmlist
diff --git a/test/completion/rpm.exp b/test/completion/rpm.exp
index c1ebf5e..c583e56 100644
--- a/test/completion/rpm.exp
+++ b/test/completion/rpm.exp
@@ -1,3 +1 @@
-if {[assert_bash_type rpm]} {
-    source "lib/completions/rpm.exp"
-}; # if
+assert_source_completions rpm
diff --git a/test/completion/rsync.exp b/test/completion/rsync.exp
index 6adf043..d927b50 100644
--- a/test/completion/rsync.exp
+++ b/test/completion/rsync.exp
@@ -1,3 +1 @@
-if {[assert_bash_type rsync]} {
-    source "lib/completions/rsync.exp"
-}; # if
+assert_source_completions rsync
diff --git a/test/completion/rtcwake.exp b/test/completion/rtcwake.exp
index 3970a42..abedd8d 100644
--- a/test/completion/rtcwake.exp
+++ b/test/completion/rtcwake.exp
@@ -1,3 +1 @@
-if {[assert_bash_type rtcwake]} {
-    source "lib/completions/rtcwake.exp"
-}; # if
+assert_source_completions rtcwake
diff --git a/test/completion/sbcl-mt.exp b/test/completion/sbcl-mt.exp
index bea489b..a5485f1 100644
--- a/test/completion/sbcl-mt.exp
+++ b/test/completion/sbcl-mt.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sbcl-mt]} {
-    source "lib/completions/sbcl-mt.exp"
-}; # if
+assert_source_completions sbcl-mt
diff --git a/test/completion/sbcl.exp b/test/completion/sbcl.exp
index d10c6f8..865f950 100644
--- a/test/completion/sbcl.exp
+++ b/test/completion/sbcl.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sbcl]} {
-    source "lib/completions/sbcl.exp"
-}; # if
+assert_source_completions sbcl
diff --git a/test/completion/scp.exp b/test/completion/scp.exp
index d100aa6..e025a9d 100644
--- a/test/completion/scp.exp
+++ b/test/completion/scp.exp
@@ -1,3 +1 @@
-if {[assert_bash_type scp]} {
-    source "lib/completions/scp.exp"
-}; # if
+assert_source_completions scp
diff --git a/test/completion/screen.exp b/test/completion/screen.exp
index f600972..8fce61d 100644
--- a/test/completion/screen.exp
+++ b/test/completion/screen.exp
@@ -1,3 +1 @@
-if {[assert_bash_type screen]} {
-    source "lib/completions/screen.exp"
-}; # if
+assert_source_completions screen
diff --git a/test/completion/sed.exp b/test/completion/sed.exp
index 8a01461..e4ce16f 100644
--- a/test/completion/sed.exp
+++ b/test/completion/sed.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sed]} {
-    source "lib/completions/sed.exp"
-}; # if
+assert_source_completions sed
diff --git a/test/completion/seq.exp b/test/completion/seq.exp
index 4dcd7bb..4123ba9 100644
--- a/test/completion/seq.exp
+++ b/test/completion/seq.exp
@@ -1,3 +1 @@
-if {[assert_bash_type seq]} {
-    source "lib/completions/seq.exp"
-}; # if
+assert_source_completions seq
diff --git a/test/completion/service.exp b/test/completion/service.exp
index b453423..a1bae6a 100644
--- a/test/completion/service.exp
+++ b/test/completion/service.exp
@@ -1,3 +1 @@
-if {[assert_bash_type service]} {
-    source "lib/completions/service.exp"
-}; # if
+assert_source_completions service
diff --git a/test/completion/set.exp b/test/completion/set.exp
index 6a882bd..e30a9c6 100644
--- a/test/completion/set.exp
+++ b/test/completion/set.exp
@@ -1,3 +1 @@
-if {[assert_bash_type set]} {
-    source "lib/completions/set.exp"
-}; # if
+assert_source_completions set
diff --git a/test/completion/sftp.exp b/test/completion/sftp.exp
index 4eb27e7..448cd21 100644
--- a/test/completion/sftp.exp
+++ b/test/completion/sftp.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sftp]} {
-    source "lib/completions/sftp.exp"
-}; # if
+assert_source_completions sftp
diff --git a/test/completion/sha1sum.exp b/test/completion/sha1sum.exp
index 46a8e8c..b6d09e8 100644
--- a/test/completion/sha1sum.exp
+++ b/test/completion/sha1sum.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sha1sum]} {
-    source "lib/completions/sha1sum.exp"
-}; # if
+assert_source_completions sha1sum
diff --git a/test/completion/shar.exp b/test/completion/shar.exp
index 1c6adb2..ae23e49 100644
--- a/test/completion/shar.exp
+++ b/test/completion/shar.exp
@@ -1,3 +1 @@
-if {[assert_bash_type shar]} {
-    source "lib/completions/shar.exp"
-}; # if
+assert_source_completions shar
diff --git a/test/completion/sitecopy.exp b/test/completion/sitecopy.exp
index 8b41359..ddb5702 100644
--- a/test/completion/sitecopy.exp
+++ b/test/completion/sitecopy.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sitecopy]} {
-    source "lib/completions/sitecopy.exp"
-}; # if
+assert_source_completions sitecopy
diff --git a/test/completion/smartctl.exp b/test/completion/smartctl.exp
index faae2bc..1b6f55d 100644
--- a/test/completion/smartctl.exp
+++ b/test/completion/smartctl.exp
@@ -1,3 +1 @@
-if {[assert_bash_type smartctl]} {
-    source "lib/completions/smartctl.exp"
-}; # if
+assert_source_completions smartctl
diff --git a/test/completion/snownews.exp b/test/completion/snownews.exp
index 4ed33e1..c7a94d2 100644
--- a/test/completion/snownews.exp
+++ b/test/completion/snownews.exp
@@ -1,3 +1 @@
-if {[assert_bash_type snownews]} {
-    source "lib/completions/snownews.exp"
-}; # if
+assert_source_completions snownews
diff --git a/test/completion/sort.exp b/test/completion/sort.exp
index 21c592f..8cc2429 100644
--- a/test/completion/sort.exp
+++ b/test/completion/sort.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sort]} {
-    source "lib/completions/sort.exp"
-}; # if
+assert_source_completions sort
diff --git a/test/completion/split.exp b/test/completion/split.exp
index fca9bcb..7861466 100644
--- a/test/completion/split.exp
+++ b/test/completion/split.exp
@@ -1,3 +1 @@
-if {[assert_bash_type split]} {
-    source "lib/completions/split.exp"
-}; # if
+assert_source_completions split
diff --git a/test/completion/spovray.exp b/test/completion/spovray.exp
index cceac7d..3c45889 100644
--- a/test/completion/spovray.exp
+++ b/test/completion/spovray.exp
@@ -1,3 +1 @@
-if {[assert_bash_type spovray]} {
-    source "lib/completions/spovray.exp"
-}; # if
+assert_source_completions spovray
diff --git a/test/completion/ssh.exp b/test/completion/ssh.exp
index f95761b..0477cba 100644
--- a/test/completion/ssh.exp
+++ b/test/completion/ssh.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {ssh}]} {
-    source "lib/completions/ssh.exp"
-}; # if
+assert_source_completions ssh
diff --git a/test/completion/sshmitm.exp b/test/completion/sshmitm.exp
index e6dc76a..f1c10ba 100644
--- a/test/completion/sshmitm.exp
+++ b/test/completion/sshmitm.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sshmitm]} {
-    source "lib/completions/sshmitm.exp"
-}; # if
+assert_source_completions sshmitm
diff --git a/test/completion/sshow.exp b/test/completion/sshow.exp
index b0c68da..8899f90 100644
--- a/test/completion/sshow.exp
+++ b/test/completion/sshow.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sshow]} {
-    source "lib/completions/sshow.exp"
-}; # if
+assert_source_completions sshow
diff --git a/test/completion/strip.exp b/test/completion/strip.exp
index 4ce3836..d56fdb2 100644
--- a/test/completion/strip.exp
+++ b/test/completion/strip.exp
@@ -1,3 +1 @@
-if {[assert_bash_type strip]} {
-    source "lib/completions/strip.exp"
-}; # if
+assert_source_completions strip
diff --git a/test/completion/sudo.exp b/test/completion/sudo.exp
index d4369ef..2a8015f 100644
--- a/test/completion/sudo.exp
+++ b/test/completion/sudo.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {sudo}]} {
-    source "lib/completions/sudo.exp"
-}; # if
+assert_source_completions sudo
diff --git a/test/completion/svk.exp b/test/completion/svk.exp
index 2905814..f3b5c4e 100644
--- a/test/completion/svk.exp
+++ b/test/completion/svk.exp
@@ -1,3 +1 @@
-if {[assert_bash_type svk]} {
-    source "lib/completions/svk.exp"
-}; # if
+assert_source_completions svk
diff --git a/test/completion/svn.exp b/test/completion/svn.exp
index 61aee59..e68594f 100644
--- a/test/completion/svn.exp
+++ b/test/completion/svn.exp
@@ -1,3 +1 @@
-if {[assert_bash_type svn]} {
-    source "lib/completions/svn.exp"
-}; # if
+assert_source_completions svn
diff --git a/test/completion/svnadmin.exp b/test/completion/svnadmin.exp
index 83e042a..cbbc0b7 100644
--- a/test/completion/svnadmin.exp
+++ b/test/completion/svnadmin.exp
@@ -1,3 +1 @@
-if {[assert_bash_type svnadmin]} {
-    source "lib/completions/svnadmin.exp"
-}; # if
+assert_source_completions svnadmin
diff --git a/test/completion/svnlook.exp b/test/completion/svnlook.exp
index 1e003e5..6f973fc 100644
--- a/test/completion/svnlook.exp
+++ b/test/completion/svnlook.exp
@@ -1,3 +1 @@
-if {[assert_bash_type svnlook]} {
-    source "lib/completions/svnlook.exp"
-}; # if
+assert_source_completions svnlook
diff --git a/test/completion/sync_members.exp b/test/completion/sync_members.exp
index 2327712..85f2f8c 100644
--- a/test/completion/sync_members.exp
+++ b/test/completion/sync_members.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sync_members]} {
-    source "lib/completions/sync_members.exp"
-}; # if
+assert_source_completions sync_members
diff --git a/test/completion/sysctl.exp b/test/completion/sysctl.exp
index debb8d6..cad1139 100644
--- a/test/completion/sysctl.exp
+++ b/test/completion/sysctl.exp
@@ -1,3 +1 @@
-if {[assert_bash_type sysctl]} {
-    source "lib/completions/sysctl.exp"
-}; # if
+assert_source_completions sysctl
diff --git a/test/completion/tac.exp b/test/completion/tac.exp
index 60ab372..98f051e 100644
--- a/test/completion/tac.exp
+++ b/test/completion/tac.exp
@@ -1,3 +1 @@
-if {[assert_bash_type tac]} {
-    source "lib/completions/tac.exp"
-}; # if
+assert_source_completions tac
diff --git a/test/completion/tail.exp b/test/completion/tail.exp
index 72793f1..362876a 100644
--- a/test/completion/tail.exp
+++ b/test/completion/tail.exp
@@ -1,3 +1 @@
-if {[assert_bash_type tail]} {
-    source "lib/completions/tail.exp"
-}; # if
+assert_source_completions tail
diff --git a/test/completion/tar.exp b/test/completion/tar.exp
index b694b66..4a30986 100644
--- a/test/completion/tar.exp
+++ b/test/completion/tar.exp
@@ -1,3 +1 @@
-if {[assert_bash_type tar]} {
-    source "lib/completions/tar.exp"
-}; # if
+assert_source_completions tar
diff --git a/test/completion/tcpkill.exp b/test/completion/tcpkill.exp
index 43473fc..c062cf3 100644
--- a/test/completion/tcpkill.exp
+++ b/test/completion/tcpkill.exp
@@ -1,3 +1 @@
-if {[assert_bash_type tcpkill]} {
-    source "lib/completions/tcpkill.exp"
-}; # if
+assert_source_completions tcpkill
diff --git a/test/completion/tcpnice.exp b/test/completion/tcpnice.exp
index 8d37573..b7f14f5 100644
--- a/test/completion/tcpnice.exp
+++ b/test/completion/tcpnice.exp
@@ -1,3 +1 @@
-if {[assert_bash_type tcpnice]} {
-    source "lib/completions/tcpnice.exp"
-}; # if
+assert_source_completions tcpnice
diff --git a/test/completion/tee.exp b/test/completion/tee.exp
index 70e9610..deb6a0d 100644
--- a/test/completion/tee.exp
+++ b/test/completion/tee.exp
@@ -1,3 +1 @@
-if {[assert_bash_type tee]} {
-    source "lib/completions/tee.exp"
-}; # if
+assert_source_completions tee
diff --git a/test/completion/texindex.exp b/test/completion/texindex.exp
index 749b520..0363595 100644
--- a/test/completion/texindex.exp
+++ b/test/completion/texindex.exp
@@ -1,3 +1 @@
-if {[assert_bash_type texindex]} {
-    source "lib/completions/texindex.exp"
-}; # if
+assert_source_completions texindex
diff --git a/test/completion/tightvncviewer.exp b/test/completion/tightvncviewer.exp
index b05ee3f..e08b756 100644
--- a/test/completion/tightvncviewer.exp
+++ b/test/completion/tightvncviewer.exp
@@ -1,3 +1 @@
-if {[assert_bash_type tightvncviewer]} {
-    source "lib/completions/tightvncviewer.exp"
-}; # if
+assert_source_completions tightvncviewer
diff --git a/test/completion/time.exp b/test/completion/time.exp
index c4fc235..fc90f52 100644
--- a/test/completion/time.exp
+++ b/test/completion/time.exp
@@ -1,3 +1 @@
-if {[assert_bash_type time]} {
-    source "lib/completions/time.exp"
-}; # if
+assert_source_completions time
diff --git a/test/completion/touch.exp b/test/completion/touch.exp
index 2361e1f..212622c 100644
--- a/test/completion/touch.exp
+++ b/test/completion/touch.exp
@@ -1,3 +1 @@
-if {[assert_bash_type touch]} {
-    source "lib/completions/touch.exp"
-}; # if
+assert_source_completions touch
diff --git a/test/completion/tr.exp b/test/completion/tr.exp
index 8279c93..c5b3f9b 100644
--- a/test/completion/tr.exp
+++ b/test/completion/tr.exp
@@ -1,3 +1 @@
-if {[assert_bash_type tr]} {
-    source "lib/completions/tr.exp"
-}; # if
+assert_source_completions tr
diff --git a/test/completion/unace.exp b/test/completion/unace.exp
index 052a39f..0fe2b39 100644
--- a/test/completion/unace.exp
+++ b/test/completion/unace.exp
@@ -1,3 +1 @@
-if {[assert_bash_type unace]} {
-    source "lib/completions/unace.exp"
-}; # if
+assert_source_completions unace
diff --git a/test/completion/uname.exp b/test/completion/uname.exp
index e53f272..45f2656 100644
--- a/test/completion/uname.exp
+++ b/test/completion/uname.exp
@@ -1,3 +1 @@
-if {[assert_bash_type uname]} {
-    source "lib/completions/uname.exp"
-}; # if
+assert_source_completions uname
diff --git a/test/completion/unexpand.exp b/test/completion/unexpand.exp
index cb6a165..ed11ba7 100644
--- a/test/completion/unexpand.exp
+++ b/test/completion/unexpand.exp
@@ -1,3 +1 @@
-if {[assert_bash_type unexpand]} {
-    source "lib/completions/unexpand.exp"
-}; # if
+assert_source_completions unexpand
diff --git a/test/completion/uniq.exp b/test/completion/uniq.exp
index c535ae9..a1dfa4a 100644
--- a/test/completion/uniq.exp
+++ b/test/completion/uniq.exp
@@ -1,3 +1 @@
-if {[assert_bash_type uniq]} {
-    source "lib/completions/uniq.exp"
-}; # if
+assert_source_completions uniq
diff --git a/test/completion/units.exp b/test/completion/units.exp
index db77cef..5c9bfb7 100644
--- a/test/completion/units.exp
+++ b/test/completion/units.exp
@@ -1,3 +1 @@
-if {[assert_bash_type units]} {
-    source "lib/completions/units.exp"
-}; # if
+assert_source_completions units
diff --git a/test/completion/unpack200.exp b/test/completion/unpack200.exp
index 1aa7d21..c90d02e 100644
--- a/test/completion/unpack200.exp
+++ b/test/completion/unpack200.exp
@@ -1,3 +1 @@
-if {[assert_bash_type unpack200]} {
-    source "lib/completions/unpack200.exp"
-}; # if
+assert_source_completions unpack200
diff --git a/test/completion/unrar.exp b/test/completion/unrar.exp
index 892b320..d9a509e 100644
--- a/test/completion/unrar.exp
+++ b/test/completion/unrar.exp
@@ -1,3 +1 @@
-if {[assert_bash_type unrar]} {
-    source "lib/completions/unrar.exp"
-}; # if
+assert_source_completions unrar
diff --git a/test/completion/unset.exp b/test/completion/unset.exp
index 5b26216..8a00dbf 100644
--- a/test/completion/unset.exp
+++ b/test/completion/unset.exp
@@ -1,3 +1 @@
-if {[assert_bash_type unset]} {
-    source "lib/completions/unset.exp"
-}; # if
+assert_source_completions unset
diff --git a/test/completion/unshunt.exp b/test/completion/unshunt.exp
index a86619a..fea1a7a 100644
--- a/test/completion/unshunt.exp
+++ b/test/completion/unshunt.exp
@@ -1,3 +1 @@
-if {[assert_bash_type unshunt]} {
-    source "lib/completions/unshunt.exp"
-}; # if
+assert_source_completions unshunt
diff --git a/test/completion/update-alternatives.exp b/test/completion/update-alternatives.exp
index 9fe1bc6..ff4bc11 100644
--- a/test/completion/update-alternatives.exp
+++ b/test/completion/update-alternatives.exp
@@ -1,3 +1 @@
-if {[assert_bash_type update-alternatives]} {
-    source "lib/completions/update-alternatives.exp"
-}; # if
+assert_source_completions update-alternatives
diff --git a/test/completion/update-rc.d.exp b/test/completion/update-rc.d.exp
index 98cf859..1becc8c 100644
--- a/test/completion/update-rc.d.exp
+++ b/test/completion/update-rc.d.exp
@@ -1,3 +1 @@
-if {[assert_bash_type update-rc.d]} {
-    source "lib/completions/update-rc.d.exp"
-}; # if
+assert_source_completions update-rc.d
diff --git a/test/completion/urlsnarf.exp b/test/completion/urlsnarf.exp
index beae4ce..c541391 100644
--- a/test/completion/urlsnarf.exp
+++ b/test/completion/urlsnarf.exp
@@ -1,3 +1 @@
-if {[assert_bash_type urlsnarf]} {
-    source "lib/completions/urlsnarf.exp"
-}; # if
+assert_source_completions urlsnarf
diff --git a/test/completion/vdir.exp b/test/completion/vdir.exp
index 287d8c1..582f3b0 100644
--- a/test/completion/vdir.exp
+++ b/test/completion/vdir.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vdir]} {
-    source "lib/completions/vdir.exp"
-}; # if
+assert_source_completions vdir
diff --git a/test/completion/vgcfgbackup.exp b/test/completion/vgcfgbackup.exp
index dbefa72..d512f0b 100644
--- a/test/completion/vgcfgbackup.exp
+++ b/test/completion/vgcfgbackup.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgcfgbackup]} {
-    source "lib/completions/vgcfgbackup.exp"
-}; # if
+assert_source_completions vgcfgbackup
diff --git a/test/completion/vgcfgrestore.exp b/test/completion/vgcfgrestore.exp
index 2599aa6..7531998 100644
--- a/test/completion/vgcfgrestore.exp
+++ b/test/completion/vgcfgrestore.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgcfgrestore]} {
-    source "lib/completions/vgcfgrestore.exp"
-}; # if
+assert_source_completions vgcfgrestore
diff --git a/test/completion/vgchange.exp b/test/completion/vgchange.exp
index 2af6bbc..80c35c6 100644
--- a/test/completion/vgchange.exp
+++ b/test/completion/vgchange.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgchange]} {
-    source "lib/completions/vgchange.exp"
-}; # if
+assert_source_completions vgchange
diff --git a/test/completion/vgck.exp b/test/completion/vgck.exp
index 6136af3..06a0829 100644
--- a/test/completion/vgck.exp
+++ b/test/completion/vgck.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgck]} {
-    source "lib/completions/vgck.exp"
-}; # if
+assert_source_completions vgck
diff --git a/test/completion/vgconvert.exp b/test/completion/vgconvert.exp
index d37ff03..374522e 100644
--- a/test/completion/vgconvert.exp
+++ b/test/completion/vgconvert.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgconvert]} {
-    source "lib/completions/vgconvert.exp"
-}; # if
+assert_source_completions vgconvert
diff --git a/test/completion/vgcreate.exp b/test/completion/vgcreate.exp
index 0ff16d5..11c3870 100644
--- a/test/completion/vgcreate.exp
+++ b/test/completion/vgcreate.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgcreate]} {
-    source "lib/completions/vgcreate.exp"
-}; # if
+assert_source_completions vgcreate
diff --git a/test/completion/vgdisplay.exp b/test/completion/vgdisplay.exp
index e1f568a..0f8653c 100644
--- a/test/completion/vgdisplay.exp
+++ b/test/completion/vgdisplay.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgdisplay]} {
-    source "lib/completions/vgdisplay.exp"
-}; # if
+assert_source_completions vgdisplay
diff --git a/test/completion/vgexport.exp b/test/completion/vgexport.exp
index 419ee2d..13f1034 100644
--- a/test/completion/vgexport.exp
+++ b/test/completion/vgexport.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgexport]} {
-    source "lib/completions/vgexport.exp"
-}; # if
+assert_source_completions vgexport
diff --git a/test/completion/vgextend.exp b/test/completion/vgextend.exp
index bf00989..4b86070 100644
--- a/test/completion/vgextend.exp
+++ b/test/completion/vgextend.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgextend]} {
-    source "lib/completions/vgextend.exp"
-}; # if
+assert_source_completions vgextend
diff --git a/test/completion/vgimport.exp b/test/completion/vgimport.exp
index 596abc7..dd45bfd 100644
--- a/test/completion/vgimport.exp
+++ b/test/completion/vgimport.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgimport]} {
-    source "lib/completions/vgimport.exp"
-}; # if
+assert_source_completions vgimport
diff --git a/test/completion/vgmerge.exp b/test/completion/vgmerge.exp
index ff2f010..5055606 100644
--- a/test/completion/vgmerge.exp
+++ b/test/completion/vgmerge.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgmerge]} {
-    source "lib/completions/vgmerge.exp"
-}; # if
+assert_source_completions vgmerge
diff --git a/test/completion/vgmknodes.exp b/test/completion/vgmknodes.exp
index 12546a8..74f13cb 100644
--- a/test/completion/vgmknodes.exp
+++ b/test/completion/vgmknodes.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgmknodes]} {
-    source "lib/completions/vgmknodes.exp"
-}; # if
+assert_source_completions vgmknodes
diff --git a/test/completion/vgreduce.exp b/test/completion/vgreduce.exp
index 91d7074..47338e0 100644
--- a/test/completion/vgreduce.exp
+++ b/test/completion/vgreduce.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgreduce]} {
-    source "lib/completions/vgreduce.exp"
-}; # if
+assert_source_completions vgreduce
diff --git a/test/completion/vgremove.exp b/test/completion/vgremove.exp
index 9b292bc..029ba70 100644
--- a/test/completion/vgremove.exp
+++ b/test/completion/vgremove.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgremove]} {
-    source "lib/completions/vgremove.exp"
-}; # if
+assert_source_completions vgremove
diff --git a/test/completion/vgrename.exp b/test/completion/vgrename.exp
index a1f0c34..17460c3 100644
--- a/test/completion/vgrename.exp
+++ b/test/completion/vgrename.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgrename]} {
-    source "lib/completions/vgrename.exp"
-}; # if
+assert_source_completions vgrename
diff --git a/test/completion/vgs.exp b/test/completion/vgs.exp
index f1becb3..470b8ec 100644
--- a/test/completion/vgs.exp
+++ b/test/completion/vgs.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgs]} {
-    source "lib/completions/vgs.exp"
-}; # if
+assert_source_completions vgs
diff --git a/test/completion/vgscan.exp b/test/completion/vgscan.exp
index f9a2fe1..a8f1ce4 100644
--- a/test/completion/vgscan.exp
+++ b/test/completion/vgscan.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgscan]} {
-    source "lib/completions/vgscan.exp"
-}; # if
+assert_source_completions vgscan
diff --git a/test/completion/vgsplit.exp b/test/completion/vgsplit.exp
index 807cb1b..d477756 100644
--- a/test/completion/vgsplit.exp
+++ b/test/completion/vgsplit.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vgsplit]} {
-    source "lib/completions/vgsplit.exp"
-}; # if
+assert_source_completions vgsplit
diff --git a/test/completion/vncviewer.exp b/test/completion/vncviewer.exp
index 657c00b..05c663d 100644
--- a/test/completion/vncviewer.exp
+++ b/test/completion/vncviewer.exp
@@ -1,3 +1 @@
-if {[assert_bash_type vncviewer]} {
-    source "lib/completions/vncviewer.exp"
-}; # if
+assert_source_completions vncviewer
diff --git a/test/completion/wc.exp b/test/completion/wc.exp
index d77b49b..fc6a043 100644
--- a/test/completion/wc.exp
+++ b/test/completion/wc.exp
@@ -1,3 +1 @@
-if {[assert_bash_type wc]} {
-    source "lib/completions/wc.exp"
-}; # if
+assert_source_completions wc
diff --git a/test/completion/webmitm.exp b/test/completion/webmitm.exp
index 48ef7d9..73d8a2a 100644
--- a/test/completion/webmitm.exp
+++ b/test/completion/webmitm.exp
@@ -1,3 +1 @@
-if {[assert_bash_type webmitm]} {
-    source "lib/completions/webmitm.exp"
-}; # if
+assert_source_completions webmitm
diff --git a/test/completion/wget.exp b/test/completion/wget.exp
index 86d3058..0607f2e 100644
--- a/test/completion/wget.exp
+++ b/test/completion/wget.exp
@@ -1,3 +1 @@
-if {[assert_bash_type wget]} {
-    source "lib/completions/wget.exp"
-}; # if
+assert_source_completions wget
diff --git a/test/completion/who.exp b/test/completion/who.exp
index c6df2a4..3a312a3 100644
--- a/test/completion/who.exp
+++ b/test/completion/who.exp
@@ -1,3 +1 @@
-if {[assert_bash_type who]} {
-    source "lib/completions/who.exp"
-}; # if
+assert_source_completions who
diff --git a/test/completion/withlist.exp b/test/completion/withlist.exp
index d729898..cfc5a54 100644
--- a/test/completion/withlist.exp
+++ b/test/completion/withlist.exp
@@ -1,3 +1 @@
-if {[assert_bash_type withlist]} {
-    source "lib/completions/withlist.exp"
-}; # if
+assert_source_completions withlist
diff --git a/test/completion/wtf.exp b/test/completion/wtf.exp
index 4f20268..3e1b364 100644
--- a/test/completion/wtf.exp
+++ b/test/completion/wtf.exp
@@ -1,3 +1 @@
-if {[assert_bash_type wtf]} {
-    source "lib/completions/wtf.exp"
-}; # if
+assert_source_completions wtf
diff --git a/test/completion/wvdial.exp b/test/completion/wvdial.exp
index d62eabf..46b6571 100644
--- a/test/completion/wvdial.exp
+++ b/test/completion/wvdial.exp
@@ -1,3 +1 @@
-if {[assert_bash_type wvdial]} {
-    source "lib/completions/wvdial.exp"
-}; # if
+assert_source_completions wvdial
diff --git a/test/completion/xhost.exp b/test/completion/xhost.exp
index 31ae9e6..159782b 100644
--- a/test/completion/xhost.exp
+++ b/test/completion/xhost.exp
@@ -1,3 +1 @@
-if {[assert_bash_type {xhost}]} {
-    source "lib/completions/xhost.exp"
-}; # if
+assert_source_completions xhost
diff --git a/test/completion/xmms.exp b/test/completion/xmms.exp
index 6dc6f92..2ebde00 100644
--- a/test/completion/xmms.exp
+++ b/test/completion/xmms.exp
@@ -1,3 +1 @@
-if {[assert_bash_type xmms]} {
-    source "lib/completions/xmms.exp"
-}; # if
+assert_source_completions xmms
diff --git a/test/completion/xpovray.exp b/test/completion/xpovray.exp
index 51eea73..1ada5e0 100644
--- a/test/completion/xpovray.exp
+++ b/test/completion/xpovray.exp
@@ -1,3 +1 @@
-if {[assert_bash_type xpovray]} {
-    source "lib/completions/xpovray.exp"
-}; # if
+assert_source_completions xpovray
diff --git a/test/completion/xsltproc.exp b/test/completion/xsltproc.exp
index 26fabe8..8729fbe 100644
--- a/test/completion/xsltproc.exp
+++ b/test/completion/xsltproc.exp
@@ -1,3 +1 @@
-if {[assert_bash_type xsltproc]} {
-    source "lib/completions/xsltproc.exp"
-}; # if
+assert_source_completions xsltproc
diff --git a/test/completion/xvnc4viewer.exp b/test/completion/xvnc4viewer.exp
index feca1c5..0c7210b 100644
--- a/test/completion/xvnc4viewer.exp
+++ b/test/completion/xvnc4viewer.exp
@@ -1,3 +1 @@
-if {[assert_bash_type xvnc4viewer]} {
-    source "lib/completions/xvnc4viewer.exp"
-}; # if
+assert_source_completions xvnc4viewer
diff --git a/test/completion/ypcat.exp b/test/completion/ypcat.exp
index 516a884..9a244c6 100644
--- a/test/completion/ypcat.exp
+++ b/test/completion/ypcat.exp
@@ -1,3 +1 @@
-if {[assert_bash_type ypcat]} {
-    source "lib/completions/ypcat.exp"
-}; # if
+assert_source_completions ypcat
diff --git a/test/completion/ypmatch.exp b/test/completion/ypmatch.exp
index e456479..5ec094f 100644
--- a/test/completion/ypmatch.exp
+++ b/test/completion/ypmatch.exp
@@ -1,3 +1 @@
-if {[assert_bash_type ypmatch]} {
-    source "lib/completions/ypmatch.exp"
-}; # if
+assert_source_completions ypmatch
diff --git a/test/completion/yum-arch.exp b/test/completion/yum-arch.exp
index 3c30a87..9528415 100644
--- a/test/completion/yum-arch.exp
+++ b/test/completion/yum-arch.exp
@@ -1,3 +1 @@
-if {[assert_bash_type yum-arch]} {
-    source "lib/completions/yum-arch.exp"
-}; # if
+assert_source_completions yum-arch
diff --git a/test/completion/yum.exp b/test/completion/yum.exp
index 247f05b..d1b7c1f 100644
--- a/test/completion/yum.exp
+++ b/test/completion/yum.exp
@@ -1,3 +1 @@
-if {[assert_bash_type yum]} {
-    source "lib/completions/yum.exp"
-}; # if
+assert_source_completions yum

-- 
bash-completion