Skip to content

Commit

Permalink
SSSDConfigTest: Do not use assertEquals
Browse files Browse the repository at this point in the history
src/config/SSSDConfigTest.py:88: DeprecationWarning: Please use assertEqual instead.
  self.assertEquals(new_options['debug_level'][0], int)
src/config/SSSDConfigTest.py:91: DeprecationWarning: Please use assertEqual instead.
  self.assertEquals(new_options['command'][0], str)
src/config/SSSDConfigTest.py:94: DeprecationWarning: Please use assertEqual instead.
  self.assertEquals(new_options['reconnection_retries'][0], int)

+ many more

Merges: https://pagure.io/SSSD/sssd/pull-request/3927

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
  • Loading branch information
Lukas Slebodnik authored and jhrozek committed Jan 29, 2019
1 parent 9b06c75 commit c4db34c
Showing 1 changed file with 35 additions and 35 deletions.
70 changes: 35 additions & 35 deletions src/config/SSSDConfigTest.py
Expand Up @@ -85,36 +85,36 @@ def testServices(self):
new_options = new_sssd_service.list_options();

self.assertTrue('debug_level' in new_options)
self.assertEquals(new_options['debug_level'][0], int)
self.assertEqual(new_options['debug_level'][0], int)

self.assertTrue('command' in new_options)
self.assertEquals(new_options['command'][0], str)
self.assertEqual(new_options['command'][0], str)

self.assertTrue('reconnection_retries' in new_options)
self.assertEquals(new_options['reconnection_retries'][0], int)
self.assertEqual(new_options['reconnection_retries'][0], int)

self.assertTrue('services' in new_options)
self.assertEquals(new_options['debug_level'][0], int)
self.assertEqual(new_options['debug_level'][0], int)

self.assertTrue('domains' in new_options)
self.assertEquals(new_options['domains'][0], list)
self.assertEquals(new_options['domains'][1], str)
self.assertEqual(new_options['domains'][0], list)
self.assertEqual(new_options['domains'][1], str)

self.assertTrue('sbus_timeout' in new_options)
self.assertEquals(new_options['sbus_timeout'][0], int)
self.assertEqual(new_options['sbus_timeout'][0], int)

self.assertTrue('re_expression' in new_options)
self.assertEquals(new_options['re_expression'][0], str)
self.assertEqual(new_options['re_expression'][0], str)

self.assertTrue('full_name_format' in new_options)
self.assertEquals(new_options['full_name_format'][0], str)
self.assertEqual(new_options['full_name_format'][0], str)

self.assertTrue('default_domain_suffix' in new_options)
self.assertEquals(new_options['default_domain_suffix'][0], str)
self.assertEqual(new_options['default_domain_suffix'][0], str)

self.assertTrue('domain_resolution_order' in new_options)
self.assertEquals(new_options['domain_resolution_order'][0], list)
self.assertEquals(new_options['domain_resolution_order'][1], str)
self.assertEqual(new_options['domain_resolution_order'][0], list)
self.assertEqual(new_options['domain_resolution_order'][1], str)

del sssdconfig

Expand Down Expand Up @@ -1127,15 +1127,15 @@ def testRemoveProvider(self):
domain.set_option('krb5_realm', 'EXAMPLE.COM')
domain.set_option('ldap_uri', 'ldap://ldap.example.com')

self.assertEquals(domain.get_option('krb5_realm'),
'EXAMPLE.COM')
self.assertEquals(domain.get_option('ldap_uri'),
'ldap://ldap.example.com')
self.assertEqual(domain.get_option('krb5_realm'),
'EXAMPLE.COM')
self.assertEqual(domain.get_option('ldap_uri'),
'ldap://ldap.example.com')

# Remove the LDAP provider and verify that krb5_realm remains
domain.remove_provider('id')
self.assertEquals(domain.get_option('krb5_realm'),
'EXAMPLE.COM')
self.assertEqual(domain.get_option('krb5_realm'),
'EXAMPLE.COM')
self.assertFalse('ldap_uri' in domain.options)

# Put the LOCAL provider back
Expand Down Expand Up @@ -1914,7 +1914,7 @@ def testSaveDomain(self):
self.assertFalse('example.com' in sssdconfig.list_active_domains())
self.assertFalse('example.com' in sssdconfig.list_inactive_domains())
self.assertFalse(sssdconfig.has_section('domain/example.com'))
self.assertEquals(domain.oldname, None)
self.assertEqual(domain.oldname, None)

# Positive test - Set the domain inactive and save it
activelist = sssdconfig.list_active_domains()
Expand All @@ -1926,10 +1926,10 @@ def testSaveDomain(self):
self.assertFalse('example.com2' in sssdconfig.list_active_domains())
self.assertTrue('example.com2' in sssdconfig.list_inactive_domains())

self.assertEquals(len(sssdconfig.list_active_domains()),
len(activelist)-1)
self.assertEquals(len(sssdconfig.list_inactive_domains()),
len(inactivelist)+1)
self.assertEqual(len(sssdconfig.list_active_domains()),
len(activelist)-1)
self.assertEqual(len(sssdconfig.list_inactive_domains()),
len(inactivelist)+1)

# Positive test - Set the domain active and save it
activelist = sssdconfig.list_active_domains()
Expand All @@ -1940,10 +1940,10 @@ def testSaveDomain(self):
self.assertTrue('example.com2' in sssdconfig.list_active_domains())
self.assertFalse('example.com2' in sssdconfig.list_inactive_domains())

self.assertEquals(len(sssdconfig.list_active_domains()),
len(activelist)+1)
self.assertEquals(len(sssdconfig.list_inactive_domains()),
len(inactivelist)-1)
self.assertEqual(len(sssdconfig.list_active_domains()),
len(activelist)+1)
self.assertEqual(len(sssdconfig.list_inactive_domains()),
len(inactivelist)-1)

# Positive test - Set the domain inactive and save it
activelist = sssdconfig.list_active_domains()
Expand All @@ -1954,10 +1954,10 @@ def testSaveDomain(self):
self.assertFalse('example.com2' in sssdconfig.list_active_domains())
self.assertTrue('example.com2' in sssdconfig.list_inactive_domains())

self.assertEquals(len(sssdconfig.list_active_domains()),
len(activelist)-1)
self.assertEquals(len(sssdconfig.list_inactive_domains()),
len(inactivelist)+1)
self.assertEqual(len(sssdconfig.list_active_domains()),
len(activelist)-1)
self.assertEqual(len(sssdconfig.list_inactive_domains()),
len(inactivelist)+1)

# Positive test - Set the domain active and save it
activelist = sssdconfig.list_active_domains()
Expand All @@ -1968,10 +1968,10 @@ def testSaveDomain(self):
self.assertTrue('example.com2' in sssdconfig.list_active_domains())
self.assertFalse('example.com2' in sssdconfig.list_inactive_domains())

self.assertEquals(len(sssdconfig.list_active_domains()),
len(activelist)+1)
self.assertEquals(len(sssdconfig.list_inactive_domains()),
len(inactivelist)-1)
self.assertEqual(len(sssdconfig.list_active_domains()),
len(activelist)+1)
self.assertEqual(len(sssdconfig.list_inactive_domains()),
len(inactivelist)-1)

# Positive test - Ensure that saved domains retain values
domain.set_option('ldap_krb5_init_creds', True)
Expand Down

0 comments on commit c4db34c

Please sign in to comment.