Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix deprecated test methods in gssapi tests #2275

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix deprecated test methods in gssapi tests #2275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 17 additions & 17 deletions tests/test_gssapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def test_pyasn1(self):

oid = encoder.encode(ObjectIdentifier(self.krb5_mech))
mech, __ = decoder.decode(oid)
self.assertEquals(self.krb5_mech, mech.__str__())
self.assertEqual(self.krb5_mech, mech.__str__())

def _gssapi_sspi_test(self):
"""
Expand Down Expand Up @@ -107,27 +107,27 @@ def _gssapi_sspi_test(self):
if self.server_mode:
c_token = gss_ctxt.step(c_token)
gss_ctxt_status = gss_ctxt.established
self.assertEquals(False, gss_ctxt_status)
self.assertEqual(False, gss_ctxt_status)
# Accept a GSS-API context.
gss_srv_ctxt = gssapi.AcceptContext()
s_token = gss_srv_ctxt.step(c_token)
gss_ctxt_status = gss_srv_ctxt.established
self.assertNotEquals(None, s_token)
self.assertEquals(True, gss_ctxt_status)
self.assertNotEqual(None, s_token)
self.assertEqual(True, gss_ctxt_status)
# Establish the client context
c_token = gss_ctxt.step(s_token)
self.assertEquals(None, c_token)
self.assertEqual(None, c_token)
else:
while not gss_ctxt.established:
c_token = gss_ctxt.step(c_token)
self.assertNotEquals(None, c_token)
self.assertNotEqual(None, c_token)
# Build MIC
mic_token = gss_ctxt.get_mic(mic_msg)

if self.server_mode:
# Check MIC
status = gss_srv_ctxt.verify_mic(mic_msg, mic_token)
self.assertEquals(0, status)
self.assertEqual(0, status)
elif _API == "PYTHON-GSSAPI-NEW":
if self.server_mode:
gss_flags = (
Expand Down Expand Up @@ -157,27 +157,27 @@ def _gssapi_sspi_test(self):
if self.server_mode:
c_token = gss_ctxt.step(c_token)
gss_ctxt_status = gss_ctxt.complete
self.assertEquals(False, gss_ctxt_status)
self.assertEqual(False, gss_ctxt_status)
# Accept a GSS-API context.
gss_srv_ctxt = gssapi.SecurityContext(usage="accept")
s_token = gss_srv_ctxt.step(c_token)
gss_ctxt_status = gss_srv_ctxt.complete
self.assertNotEquals(None, s_token)
self.assertEquals(True, gss_ctxt_status)
self.assertNotEqual(None, s_token)
self.assertEqual(True, gss_ctxt_status)
# Establish the client context
c_token = gss_ctxt.step(s_token)
self.assertEquals(None, c_token)
self.assertEqual(None, c_token)
else:
while not gss_ctxt.complete:
c_token = gss_ctxt.step(c_token)
self.assertNotEquals(None, c_token)
self.assertNotEqual(None, c_token)
# Build MIC
mic_token = gss_ctxt.get_signature(mic_msg)

if self.server_mode:
# Check MIC
status = gss_srv_ctxt.verify_signature(mic_msg, mic_token)
self.assertEquals(0, status)
self.assertEqual(0, status)
else:
gss_flags = (
sspicon.ISC_REQ_INTEGRITY
Expand All @@ -192,24 +192,24 @@ def _gssapi_sspi_test(self):
if self.server_mode:
error, token = gss_ctxt.authorize(c_token)
c_token = token[0].Buffer
self.assertEquals(0, error)
self.assertEqual(0, error)
# Accept a GSS-API context.
gss_srv_ctxt = sspi.ServerAuth("Kerberos", spn=target_name)
error, token = gss_srv_ctxt.authorize(c_token)
s_token = token[0].Buffer
# Establish the context.
error, token = gss_ctxt.authorize(s_token)
c_token = token[0].Buffer
self.assertEquals(None, c_token)
self.assertEquals(0, error)
self.assertEqual(None, c_token)
self.assertEqual(0, error)
# Build MIC
mic_token = gss_ctxt.sign(mic_msg)
# Check MIC
gss_srv_ctxt.verify(mic_msg, mic_token)
else:
error, token = gss_ctxt.authorize(c_token)
c_token = token[0].Buffer
self.assertNotEquals(0, error)
self.assertNotEqual(0, error)

def test_gssapi_sspi_client(self):
"""
Expand Down
18 changes: 9 additions & 9 deletions tests/test_kex_gss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ def _test_gsskex_and_auth(self, gss_host, rekey=False):
)

self.event.wait(1.0)
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())
self.assertEquals(True, self.tc.get_transport().gss_kex_used)
self.assertTrue(self.event.is_set())
self.assertTrue(self.ts.is_active())
self.assertEqual(self.username, self.ts.get_username())
self.assertEqual(True, self.ts.is_authenticated())
self.assertEqual(True, self.tc.get_transport().gss_kex_used)

stdin, stdout, stderr = self.tc.exec_command("yes")
schan = self.ts.accept(1.0)
Expand All @@ -128,10 +128,10 @@ def _test_gsskex_and_auth(self, gss_host, rekey=False):
schan.send_stderr("This is on stderr.\n")
schan.close()

self.assertEquals("Hello there.\n", stdout.readline())
self.assertEquals("", stdout.readline())
self.assertEquals("This is on stderr.\n", stderr.readline())
self.assertEquals("", stderr.readline())
self.assertEqual("Hello there.\n", stdout.readline())
self.assertEqual("", stdout.readline())
self.assertEqual("This is on stderr.\n", stderr.readline())
self.assertEqual("", stderr.readline())

stdin.close()
stdout.close()
Expand Down
12 changes: 6 additions & 6 deletions tests/test_ssh_gss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ def _test_connection(self, **kwargs):
self.event.wait(1.0)
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())
self.assertEqual(self.username, self.ts.get_username())
self.assertEqual(True, self.ts.is_authenticated())

stdin, stdout, stderr = self.tc.exec_command("yes")
schan = self.ts.accept(1.0)
Expand All @@ -130,10 +130,10 @@ def _test_connection(self, **kwargs):
schan.send_stderr("This is on stderr.\n")
schan.close()

self.assertEquals("Hello there.\n", stdout.readline())
self.assertEquals("", stdout.readline())
self.assertEquals("This is on stderr.\n", stderr.readline())
self.assertEquals("", stderr.readline())
self.assertEqual("Hello there.\n", stdout.readline())
self.assertEqual("", stdout.readline())
self.assertEqual("This is on stderr.\n", stderr.readline())
self.assertEqual("", stderr.readline())

stdin.close()
stdout.close()
Expand Down