diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-02-27 20:58:39 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-02-27 20:58:39 -0500 |
| commit | 2d350c134658392dfd7ffe55e101ff8a61bd3010 (patch) | |
| tree | ab7dfd059661897dbe48d135d5a89390f6fef918 /tests | |
| parent | 578ae9dcfdb4b9973f784adb3b67f24b52d79989 (diff) | |
| parent | 74ba0149347bfeb2f83ddd46672a2912aea51f23 (diff) | |
Merge branch 'master' into switch-to-cryptography
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_util.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/test_util.py b/tests/test_util.py index bfdc525e..a6a2c30b 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -30,6 +30,7 @@ import paramiko.util from paramiko.util import lookup_ssh_host_config as host_config, safe_string from paramiko.py3compat import StringIO, byte_ord, b +# Note some lines in this configuration have trailing spaces on purpose test_config_file = """\ Host * User robey @@ -110,7 +111,7 @@ class UtilTest(unittest.TestCase): self.assertEqual(config._config, [{'host': ['*'], 'config': {}}, {'host': ['*'], 'config': {'identityfile': ['~/.ssh/id_rsa'], 'user': 'robey'}}, {'host': ['*.example.com'], 'config': {'user': 'bjork', 'port': '3333'}}, - {'host': ['*'], 'config': {'crazy': 'something dumb '}}, + {'host': ['*'], 'config': {'crazy': 'something dumb'}}, {'host': ['spoo.example.com'], 'config': {'crazy': 'something else'}}]) def test_3_host_config(self): @@ -119,14 +120,14 @@ class UtilTest(unittest.TestCase): config = paramiko.util.parse_ssh_config(f) for host, values in { - 'irc.danger.com': {'crazy': 'something dumb ', + 'irc.danger.com': {'crazy': 'something dumb', 'hostname': 'irc.danger.com', 'user': 'robey'}, - 'irc.example.com': {'crazy': 'something dumb ', + 'irc.example.com': {'crazy': 'something dumb', 'hostname': 'irc.example.com', 'user': 'robey', 'port': '3333'}, - 'spoo.example.com': {'crazy': 'something dumb ', + 'spoo.example.com': {'crazy': 'something dumb', 'hostname': 'spoo.example.com', 'user': 'robey', 'port': '3333'} |