diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2015-10-30 11:13:24 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2015-10-30 11:13:24 -0700 |
commit | fa631508e4e736f2cc5dc61c3c5c2c259ea4422f (patch) | |
tree | 49f2392384d4659c18f4be1d06e09f3c774b7c1a /tests/test_ssh_gss.py | |
parent | 53e91cc449ff3070cd57af2ed317a17a47d378e1 (diff) | |
parent | 0b9d772a21a44af38ecceae0fdbae645e386bd9b (diff) |
Merge branch 'master' into 596-int
Diffstat (limited to 'tests/test_ssh_gss.py')
-rw-r--r-- | tests/test_ssh_gss.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/test_ssh_gss.py b/tests/test_ssh_gss.py index 595081b8..e20d348f 100644 --- a/tests/test_ssh_gss.py +++ b/tests/test_ssh_gss.py @@ -57,14 +57,12 @@ class NullServer (paramiko.ServerInterface): class GSSAuthTest(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) @@ -104,7 +102,7 @@ class GSSAuthTest(unittest.TestCase): gss_auth=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()) |