From 6e08dc550474c66bc09a539d7f35d2f58891be9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 26 Oct 2011 21:24:56 +0300
Subject: [PATCH] testsuite/assert_source_completions: Test for command
 availability too.

We now install (_minimal) completions for just about everything, but
that doesn't mean we can sanely test everything if the command is not
available.
---
 test/lib/library.exp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/lib/library.exp b/test/lib/library.exp
index 35eddf80..f6e9f21a 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -580,12 +580,13 @@ proc assert_no_output {{cmd} {test ""} {prompt /@}} {
 
 
 # Source/run file with additional tests if completion for the specified command
-# is installed in bash.
+# is installed in bash, and the command is available.
 # @param string $command  Command to check completion availability for.
 # @param string $file  (optional) File to source/run.  Default is
 #                      "lib/completions/$cmd.exp".
 proc assert_source_completions {command {file ""}} {
-    if {[is_bash_completion_installed_for $command]} {
+    if {[assert_bash_type $command]
+        && [is_bash_completion_installed_for $command]} {
         if {[string length $file] == 0} {
             set file "$::srcdir/lib/completions/$command.exp"
         }