diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-18 11:19:35 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-18 11:19:35 -0800 |
| commit | b3884d2c44233f16cd334c4abcfddcf5e8bf8ef6 (patch) | |
| tree | 107d26c33a7fb1428bda2ed5be9b9e2e09277c72 /tests/test_client.py | |
| parent | 37756f3a8892dbb41dfda74dcf37e21053bf4e34 (diff) | |
| parent | 681f32583fe052c0516a2fda67e163169676ad11 (diff) | |
Merge branch 'master' into switch-to-cryptography
Conflicts:
paramiko/ecdsakey.py
paramiko/util.py
Diffstat (limited to 'tests/test_client.py')
| -rw-r--r-- | tests/test_client.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test_client.py b/tests/test_client.py index 1978004e..cef7b28d 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -131,7 +131,7 @@ class SSHClientTest (unittest.TestCase): # Authentication successful? self.event.wait(1.0) - self.assertTrue(self.event.isSet()) + self.assertTrue(self.event.is_set()) self.assertTrue(self.ts.is_active()) self.assertEqual('slowdive', self.ts.get_username()) self.assertEqual(True, self.ts.is_authenticated()) @@ -229,7 +229,7 @@ class SSHClientTest (unittest.TestCase): self.tc.connect(self.addr, self.port, username='slowdive', password='pygmalion') self.event.wait(1.0) - self.assertTrue(self.event.isSet()) + self.assertTrue(self.event.is_set()) self.assertTrue(self.ts.is_active()) self.assertEqual('slowdive', self.ts.get_username()) self.assertEqual(True, self.ts.is_authenticated()) @@ -283,7 +283,7 @@ class SSHClientTest (unittest.TestCase): self.tc.connect(self.addr, self.port, username='slowdive', password='pygmalion') self.event.wait(1.0) - self.assertTrue(self.event.isSet()) + self.assertTrue(self.event.is_set()) self.assertTrue(self.ts.is_active()) p = weakref.ref(self.tc._transport.packetizer) @@ -312,7 +312,7 @@ class SSHClientTest (unittest.TestCase): self.tc.connect(self.addr, self.port, username='slowdive', password='pygmalion') self.event.wait(1.0) - self.assertTrue(self.event.isSet()) + self.assertTrue(self.event.is_set()) self.assertTrue(self.ts.is_active()) self.assertTrue(self.tc._transport is not None) |