summaryrefslogtreecommitdiff
path: root/tests/test_util.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-08-25 22:45:07 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-08-25 22:45:07 -0700
commitbc07b04e8ed4ddf9e97cf80cf39021828b94b3cf (patch)
treefa760f0407e32c2280d7737411acfa300a6641af /tests/test_util.py
parenta22bf77030acaa476512752a2862244e90a3f1b6 (diff)
parent12e752d11aa22ee6ba959115725e386ca779c1cb (diff)
downloadparamiko-bc07b04e8ed4ddf9e97cf80cf39021828b94b3cf.tar.gz
Merge branch '1.13' into 1.14
Diffstat (limited to 'tests/test_util.py')
-rw-r--r--tests/test_util.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/test_util.py b/tests/test_util.py
index 69c75518..44fb8ab5 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -333,3 +333,9 @@ IdentityFile something_%l_using_fqdn
"""
config = paramiko.util.parse_ssh_config(StringIO(test_config))
assert config.lookup('meh') # will die during lookup() if bug regresses
+
+ def test_13_config_dos_crlf_succeeds(self):
+ config_file = StringIO("host abcqwerty\r\nHostName 127.0.0.1\r\n")
+ config = paramiko.SSHConfig()
+ config.parse(config_file)
+ self.assertEqual(config.lookup("abcqwerty")["hostname"], "127.0.0.1")