diff options
Diffstat (limited to '')
-rw-r--r-- | test/fixtures/_known_hosts/.ssh/config_asterisk_1 (renamed from test/fixtures/_known_hosts_real/.ssh/config_asterisk_1) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/.ssh/config_asterisk_2 (renamed from test/fixtures/_known_hosts_real/.ssh/config_asterisk_2) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/.ssh/config_question_mark (renamed from test/fixtures/_known_hosts_real/.ssh/config_question_mark) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/.ssh/config_relative_path (renamed from test/fixtures/_known_hosts_real/.ssh/config_relative_path) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/config_full_path (renamed from test/fixtures/_known_hosts_real/config_full_path) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/config_include (renamed from test/fixtures/_known_hosts_real/config_include) | 4 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/config_include_recursion (renamed from test/fixtures/_known_hosts_real/config_include_recursion) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/gee-filename-canary (renamed from test/fixtures/_known_hosts_real/gee-filename-canary) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/known_hosts (renamed from test/fixtures/_known_hosts_real/known_hosts) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/known_hosts2 (renamed from test/fixtures/_known_hosts_real/known_hosts2) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/known_hosts3 (renamed from test/fixtures/_known_hosts_real/known_hosts3) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/known_hosts4 (renamed from test/fixtures/_known_hosts_real/known_hosts4) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/localhost_hosts (renamed from test/fixtures/_known_hosts_real/localhost_hosts) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts/spaced known_hosts (renamed from test/fixtures/_known_hosts_real/spaced known_hosts) | 0 | ||||
-rw-r--r-- | test/fixtures/_known_hosts_real/config | 7 | ||||
-rw-r--r-- | test/fixtures/_known_hosts_real/config_tilde | 4 | ||||
-rw-r--r-- | test/fixtures/_known_hosts_real/localhost_config | 1 | ||||
-rw-r--r-- | test/fixtures/_known_hosts_real/spaced conf | 8 |
18 files changed, 3 insertions, 21 deletions
diff --git a/test/fixtures/_known_hosts_real/.ssh/config_asterisk_1 b/test/fixtures/_known_hosts/.ssh/config_asterisk_1 index fc09eb0..fc09eb0 100644 --- a/test/fixtures/_known_hosts_real/.ssh/config_asterisk_1 +++ b/test/fixtures/_known_hosts/.ssh/config_asterisk_1 diff --git a/test/fixtures/_known_hosts_real/.ssh/config_asterisk_2 b/test/fixtures/_known_hosts/.ssh/config_asterisk_2 index 42243ad..42243ad 100644 --- a/test/fixtures/_known_hosts_real/.ssh/config_asterisk_2 +++ b/test/fixtures/_known_hosts/.ssh/config_asterisk_2 diff --git a/test/fixtures/_known_hosts_real/.ssh/config_question_mark b/test/fixtures/_known_hosts/.ssh/config_question_mark index 08e1201..08e1201 100644 --- a/test/fixtures/_known_hosts_real/.ssh/config_question_mark +++ b/test/fixtures/_known_hosts/.ssh/config_question_mark diff --git a/test/fixtures/_known_hosts_real/.ssh/config_relative_path b/test/fixtures/_known_hosts/.ssh/config_relative_path index a7ad4d1..a7ad4d1 100644 --- a/test/fixtures/_known_hosts_real/.ssh/config_relative_path +++ b/test/fixtures/_known_hosts/.ssh/config_relative_path diff --git a/test/fixtures/_known_hosts_real/config_full_path b/test/fixtures/_known_hosts/config_full_path index a91649b..a91649b 100644 --- a/test/fixtures/_known_hosts_real/config_full_path +++ b/test/fixtures/_known_hosts/config_full_path diff --git a/test/fixtures/_known_hosts_real/config_include b/test/fixtures/_known_hosts/config_include index a1ae763..d68b0d8 100644 --- a/test/fixtures/_known_hosts_real/config_include +++ b/test/fixtures/_known_hosts/config_include @@ -1,7 +1,9 @@ -#$HOME set to fixtures/_known_hosts_real in unit test +#$HOME set to fixtures/_known_hosts in unit test # Include with full path (recursive one) Include ~/config_full_path # Include with relative path Include config_relative_path # Include with wildcards, and more than one on same row Include config_asterisk* config_?uestion_mark +# Include a directory name. This is a misconfiguration, but ssh ignores it without errors. +Include ../../_known_hosts diff --git a/test/fixtures/_known_hosts_real/config_include_recursion b/test/fixtures/_known_hosts/config_include_recursion index 2777069..2777069 100644 --- a/test/fixtures/_known_hosts_real/config_include_recursion +++ b/test/fixtures/_known_hosts/config_include_recursion diff --git a/test/fixtures/_known_hosts_real/gee-filename-canary b/test/fixtures/_known_hosts/gee-filename-canary index e69de29..e69de29 100644 --- a/test/fixtures/_known_hosts_real/gee-filename-canary +++ b/test/fixtures/_known_hosts/gee-filename-canary diff --git a/test/fixtures/_known_hosts_real/known_hosts b/test/fixtures/_known_hosts/known_hosts index 646b5b6..646b5b6 100644 --- a/test/fixtures/_known_hosts_real/known_hosts +++ b/test/fixtures/_known_hosts/known_hosts diff --git a/test/fixtures/_known_hosts_real/known_hosts2 b/test/fixtures/_known_hosts/known_hosts2 index 2eb4d4f..2eb4d4f 100644 --- a/test/fixtures/_known_hosts_real/known_hosts2 +++ b/test/fixtures/_known_hosts/known_hosts2 diff --git a/test/fixtures/_known_hosts_real/known_hosts3 b/test/fixtures/_known_hosts/known_hosts3 index 2bdf67a..2bdf67a 100644 --- a/test/fixtures/_known_hosts_real/known_hosts3 +++ b/test/fixtures/_known_hosts/known_hosts3 diff --git a/test/fixtures/_known_hosts_real/known_hosts4 b/test/fixtures/_known_hosts/known_hosts4 index 8510665..8510665 100644 --- a/test/fixtures/_known_hosts_real/known_hosts4 +++ b/test/fixtures/_known_hosts/known_hosts4 diff --git a/test/fixtures/_known_hosts_real/localhost_hosts b/test/fixtures/_known_hosts/localhost_hosts index ff752c2..ff752c2 100644 --- a/test/fixtures/_known_hosts_real/localhost_hosts +++ b/test/fixtures/_known_hosts/localhost_hosts diff --git a/test/fixtures/_known_hosts_real/spaced known_hosts b/test/fixtures/_known_hosts/spaced known_hosts index d54a04d..d54a04d 100644 --- a/test/fixtures/_known_hosts_real/spaced known_hosts +++ b/test/fixtures/_known_hosts/spaced known_hosts diff --git a/test/fixtures/_known_hosts_real/config b/test/fixtures/_known_hosts_real/config deleted file mode 100644 index fe3fb54..0000000 --- a/test/fixtures/_known_hosts_real/config +++ /dev/null @@ -1,7 +0,0 @@ - UserKnownHostsFile _known_hosts_real/known_hosts - - # Unindented -Host gee* jar?this-part-we-do-not-complete-at-least-yet - HostName %h.example.com - # Indented - Host hus%%eth0 !negated #not-a-comment diff --git a/test/fixtures/_known_hosts_real/config_tilde b/test/fixtures/_known_hosts_real/config_tilde deleted file mode 100644 index 4181aaf..0000000 --- a/test/fixtures/_known_hosts_real/config_tilde +++ /dev/null @@ -1,4 +0,0 @@ -# With quotes and tilde -UserKnownHostsFile "~/_known_hosts_real/known_hosts2" -# Without quotes, with tilde, and another on the same line -UserKnownHostsFile ~/_known_hosts_real/known_hosts3 _known_hosts_real/known_hosts4 diff --git a/test/fixtures/_known_hosts_real/localhost_config b/test/fixtures/_known_hosts_real/localhost_config deleted file mode 100644 index 30b6623..0000000 --- a/test/fixtures/_known_hosts_real/localhost_config +++ /dev/null @@ -1 +0,0 @@ -UserKnownHostsFile _known_hosts_real/localhost_hosts diff --git a/test/fixtures/_known_hosts_real/spaced conf b/test/fixtures/_known_hosts_real/spaced conf deleted file mode 100644 index 566b92c..0000000 --- a/test/fixtures/_known_hosts_real/spaced conf +++ /dev/null @@ -1,8 +0,0 @@ - - # Unindented -Host gee - UserKnownHostsFile "_known_hosts_real/spaced known_hosts" - - # Indented - Host hus #not-a-comment - UserKnownHostsFile "_known_hosts_real/known_hosts2" |