diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-11-30 20:02:20 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-11-30 20:02:20 -0800 |
| commit | 9aec0c6300686e571fab5405c52876e6399f92e9 (patch) | |
| tree | 8521aae70c6ebe889b92cbb9db69fd632f0fed08 /tests/test_kex_gss.py | |
| parent | 2a568863bb462fbae50fdd4795bf4d3e05e101bb (diff) | |
| parent | 7366f965546c015c3f9e9dd1ccb8f0b7b8758dae (diff) | |
Merge branch 'master' into 398-int
Diffstat (limited to 'tests/test_kex_gss.py')
| -rw-r--r-- | tests/test_kex_gss.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/test_kex_gss.py b/tests/test_kex_gss.py index b5e277b3..3bf788da 100644 --- a/tests/test_kex_gss.py +++ b/tests/test_kex_gss.py @@ -58,14 +58,12 @@ class NullServer (paramiko.ServerInterface): class GSSKexTest(unittest.TestCase): - + @staticmethod def init(username, hostname): global krb5_principal, targ_name krb5_principal = username targ_name = hostname - init = staticmethod(init) - def setUp(self): self.username = krb5_principal self.hostname = socket.getfqdn(targ_name) @@ -84,7 +82,7 @@ class GSSKexTest(unittest.TestCase): def _run(self): self.socks, addr = self.sockl.accept() - self.ts = paramiko.Transport(self.socks, True) + self.ts = paramiko.Transport(self.socks, gss_kex=True) host_key = paramiko.RSAKey.from_private_key_file('tests/test_rsa.key') self.ts.add_server_key(host_key) self.ts.set_gss_host(targ_name) @@ -111,7 +109,7 @@ class GSSKexTest(unittest.TestCase): gss_auth=True, gss_kex=True) self.event.wait(1.0) - self.assert_(self.event.isSet()) + self.assert_(self.event.is_set()) self.assert_(self.ts.is_active()) self.assertEquals(self.username, self.ts.get_username()) self.assertEquals(True, self.ts.is_authenticated()) |