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

[Freddy Vulto (none)]

The following commit has been merged in the master branch:
commit b1d869cbf25647694173b5d3f2946cf366b2161f
Author: Freddy Vulto <freddy at rebase.(none)>
Date:   Sat Jun 13 08:42:22 2009 +0200

    Renamed unit test _known_hosts > _known_hosts_real

diff --git a/test/fixtures/_known_hosts/spaced  conf b/test/fixtures/_known_hosts/spaced  conf
deleted file mode 100644
index 399c7a2..0000000
--- a/test/fixtures/_known_hosts/spaced  conf	
+++ /dev/null
@@ -1,9 +0,0 @@
-
-    # Unindented
-Host gee
-    UserKnownHostsFile "fixtures/_known_hosts/spaced  known_hosts"
-
-	# Indented
-    Host hus  # With comment
-    UserKnownHostsFile "fixtures/_known_hosts/known_hosts2"
-
diff --git a/test/fixtures/_known_hosts/config b/test/fixtures/_known_hosts_real/config
similarity index 52%
rename from test/fixtures/_known_hosts/config
rename to test/fixtures/_known_hosts_real/config
index d0a0b65..9b9da43 100644
--- a/test/fixtures/_known_hosts/config
+++ b/test/fixtures/_known_hosts_real/config
@@ -1,4 +1,4 @@
-    UserKnownHostsFile fixtures/_known_hosts/known_hosts
+    UserKnownHostsFile fixtures/_known_hosts_real/known_hosts
 
     # Unindented
 Host gee
diff --git a/test/fixtures/_known_hosts/known_hosts b/test/fixtures/_known_hosts_real/known_hosts
similarity index 100%
rename from test/fixtures/_known_hosts/known_hosts
rename to test/fixtures/_known_hosts_real/known_hosts
diff --git a/test/fixtures/_known_hosts/known_hosts2 b/test/fixtures/_known_hosts_real/known_hosts2
similarity index 100%
rename from test/fixtures/_known_hosts/known_hosts2
rename to test/fixtures/_known_hosts_real/known_hosts2
diff --git a/test/fixtures/_known_hosts_real/spaced  conf b/test/fixtures/_known_hosts_real/spaced  conf
new file mode 100644
index 0000000..f484f0e
--- /dev/null
+++ b/test/fixtures/_known_hosts_real/spaced  conf	
@@ -0,0 +1,9 @@
+
+    # Unindented
+Host gee
+    UserKnownHostsFile "fixtures/_known_hosts_real/spaced  known_hosts"
+
+	# Indented
+    Host hus  # With comment
+    UserKnownHostsFile "fixtures/_known_hosts_real/known_hosts2"
+
diff --git a/test/fixtures/_known_hosts/spaced  known_hosts b/test/fixtures/_known_hosts_real/spaced  known_hosts
similarity index 100%
rename from test/fixtures/_known_hosts/spaced  known_hosts
rename to test/fixtures/_known_hosts_real/spaced  known_hosts
diff --git a/test/unit/_known_hosts.exp b/test/unit/_known_hosts_real.exp
similarity index 82%
rename from test/unit/_known_hosts.exp
rename to test/unit/_known_hosts_real.exp
index c9b6121..4452e3a 100644
--- a/test/unit/_known_hosts.exp
+++ b/test/unit/_known_hosts_real.exp
@@ -17,13 +17,13 @@ set test "Hosts should be put in COMPREPLY"
     # Example string: host1\s+host2\s+host3
 
 set hosts [exec bash -c "compgen -A hostname"]
-    # Hosts `gee' and `hus' are defined in ./fixtures/_known_hosts/config
-    # Hosts `doo' and `ike' are defined in ./fixtures/_known_hosts/known_hosts
+    # Hosts `gee' and `hus' are defined in ./fixtures/_known_hosts_real/config
+    # Hosts `doo' and `ike' are defined in ./fixtures/_known_hosts_real/known_hosts
 lappend hosts doo gee hus ike
 set hosts [lsort -ascii $hosts]
 set hosts [join $hosts "\\s+"]
     # Call _known_hosts
-set cmd {_known_hosts -aF fixtures/_known_hosts/config; echo_array COMPREPLY}
+set cmd {_known_hosts -aF fixtures/_known_hosts_real/config; echo_array COMPREPLY}
 send "$cmd\r"
 expect -ex "$cmd\r\n"
 expect {
@@ -40,14 +40,14 @@ set test "Config file containing space should work"
     # Build string list of hostnames, separated by regexp whitespace marker (\s+).
     # Example string: host1\s+host2\s+host3
 set hosts [exec bash -c "compgen -A hostname"]
-    # Hosts `gee' and `hus' are defined in ./fixtures/_known_hosts/spaced  conf
-    # Hosts `doo' and `ike' are defined in ./fixtures/_known_hosts/known_hosts
-    # Host `two' is defined in ./fixtures/_known_hosts/known_hosts2
+    # Hosts `gee' and `hus' are defined in ./fixtures/_known_hosts_real/spaced  conf
+    # Hosts `doo' and `ike' are defined in ./fixtures/_known_hosts_real/known_hosts
+    # Host `two' is defined in ./fixtures/_known_hosts_real/known_hosts2
 lappend hosts gee hus doo ike two
 set hosts [lsort -ascii $hosts]
 set hosts [join $hosts "\\s+"]
     # Call _known_hosts
-set cmd {_known_hosts -aF 'fixtures/_known_hosts/spaced  conf'; echo_array COMPREPLY}
+set cmd {_known_hosts -aF 'fixtures/_known_hosts_real/spaced  conf'; echo_array COMPREPLY}
 send "$cmd\r"
 expect -ex "$cmd\r\n"
 expect {

-- 
bash-completion