diff options
| -rw-r--r-- | dev-requirements.txt | 4 | ||||
| -rw-r--r-- | tests/test_client.py | 10 | ||||
| -rw-r--r-- | tests/test_util.py | 10 |
3 files changed, 9 insertions, 15 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index 3af84aa9..c9fd4965 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,8 +2,8 @@ invoke>=1.0,<2.0 invocations>=1.2.0,<2.0 # NOTE: pytest-relaxed currently only works with pytest >=3, <3.3 -pytest>=3.2,<3.3 -pytest-relaxed==1.1.4 +pytest==4.6.3 +pytest-relaxed==1.1.5 mock==2.0.0 # Linting! flake8==2.4.0 diff --git a/tests/test_client.py b/tests/test_client.py index 87f7bcb2..f87c2692 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -291,15 +291,13 @@ class SSHClientTest(unittest.TestCase): os.close(fd) client = paramiko.SSHClient() - self.assertEquals(0, len(client.get_host_keys())) + assert len(client.get_host_keys()) == 0 host_id = "[%s]:%d" % (self.addr, self.port) client.get_host_keys().add(host_id, "ssh-rsa", public_host_key) - self.assertEquals(1, len(client.get_host_keys())) - self.assertEquals( - public_host_key, client.get_host_keys()[host_id]["ssh-rsa"] - ) + assert len(client.get_host_keys()) == 1 + assert public_host_key == client.get_host_keys()[host_id]["ssh-rsa"] client.save_host_keys(localname) @@ -350,7 +348,7 @@ class SSHClientTest(unittest.TestCase): with paramiko.SSHClient() as tc: self.tc = tc self.tc.set_missing_host_key_policy(paramiko.AutoAddPolicy()) - self.assertEquals(0, len(self.tc.get_host_keys())) + assert len(self.tc.get_host_keys()) == 0 self.tc.connect(**dict(self.connect_kwargs, password="pygmalion")) self.event.wait(1.0) diff --git a/tests/test_util.py b/tests/test_util.py index 12256b39..36d69de7 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -453,9 +453,7 @@ Host param4 "p a r" "p" "par" para f = StringIO(test_config_file) config = paramiko.util.parse_ssh_config(f) for host, values in res.items(): - self.assertEquals( - paramiko.util.lookup_ssh_host_config(host, config), values - ) + assert paramiko.util.lookup_ssh_host_config(host, config) == values def test_quoted_params_in_config(self): test_config_file = """\ @@ -486,9 +484,7 @@ Host param3 parara f = StringIO(test_config_file) config = paramiko.util.parse_ssh_config(f) for host, values in res.items(): - self.assertEquals( - paramiko.util.lookup_ssh_host_config(host, config), values - ) + assert paramiko.util.lookup_ssh_host_config(host, config) == values def test_quoted_host_in_config(self): conf = SSHConfig() @@ -507,7 +503,7 @@ Host param3 parara } incorrect_data = ['param"', '"param', 'param "pam', 'param "pam" "p a'] for host, values in correct_data.items(): - self.assertEquals(conf._get_hosts(host), values) + assert conf._get_hosts(host) == values for host in incorrect_data: self.assertRaises(Exception, conf._get_hosts, host) |