diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 13:23:02 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 13:23:02 -0700 |
| commit | 0e784d81131a369da88051e4c12dd6e4b5e3c8b1 (patch) | |
| tree | 4bec5f731196ced01797d11548dde6ca84f22c9e /tests/test_util.py | |
| parent | f258d1e207a21d4342dbc431fcc4a4dafe893e80 (diff) | |
| parent | 720806734a05d9de0f47588d816de05646a06f0b (diff) | |
Merge branch 'master' into 184-int
Conflicts:
paramiko/config.py
tests/test_util.py
Diffstat (limited to 'tests/test_util.py')
| -rw-r--r-- | tests/test_util.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/test_util.py b/tests/test_util.py index 8142d416..394ea553 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -334,6 +334,12 @@ 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") + def test_quoted_host_names(self): test_config_file = """\ Host "param pam" param "pam" |