diff options
Diffstat (limited to 'tests/test_util.py')
| -rw-r--r-- | tests/test_util.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/test_util.py b/tests/test_util.py index c97c1d58..e6f417d4 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -205,6 +205,7 @@ Host * self.assertRaises(AssertionError, lambda: paramiko.util.retry_on_signal(raises_other_exception)) +<<<<<<< HEAD def test_9_proxycommand_config_equals_parsing(self): """ ProxyCommand should not split on equals signs within the value. @@ -271,7 +272,8 @@ Host * paramiko.util.lookup_ssh_host_config(host, config), {'hostname': host, 'port': '8080'} ) - def test_10_host_config_test_proxycommand(self): + + def test_12_host_config_test_proxycommand(self): test_config_file = """ Host proxy-with-equal-divisor-and-space ProxyCommand = foo=bar |