diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-01-19 14:46:46 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-01-19 14:46:46 -0800 |
| commit | 4968eaf8c92c0b59037444dcd4ce08a71e203ec2 (patch) | |
| tree | 55fc99130c78131b8e911de482d8afe2084080b4 /tests/test_util.py | |
| parent | a1fbc37779f9bb1ee152057e7110d5b1c77a863c (diff) | |
| parent | 1919014fa649d32dec4039f2b8c115233c082418 (diff) | |
Merge branch '1.13' into 1.14
Diffstat (limited to 'tests/test_util.py')
| -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 7889aa7a..25e447bb 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -31,6 +31,7 @@ from paramiko.py3compat import StringIO, byte_ord, b from tests.util import ParamikoTest +# Note some lines in this configuration have trailing spaces on purpose test_config_file = """\ Host * User robey @@ -106,7 +107,7 @@ class UtilTest(ParamikoTest): 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): @@ -115,14 +116,14 @@ class UtilTest(ParamikoTest): 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'} |