Replacement of old, deprecated aliases for unit-test methods

Client/src/bkr/client/tests/test_wizard.py

@@ -3,10 +3,9 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 
+from six import assertRegex
 import unittest
 from datetime import date
-
-import six
 from six.moves import StringIO
 
 from bkr.client import wizard
@@ -165,6 +164,6 @@ def test_prints_full_heading(self, cpt_stdout):
         type.heading()
         cpt_stdout.seek(0)
         printout = cpt_stdout.read()
-        six.assertRegex(self, printout, r'\bWhat is the type of test?\b')
-        six.assertRegex(self, printout, r'\bRecommended values\b')
-        six.assertRegex(self, printout, r'\bPossible values\b')
+        assertRegex(self, printout, r'\bWhat is the type of test?\b')
+        assertRegex(self, printout, r'\bRecommended values\b')
+        assertRegex(self, printout, r'\bPossible values\b')

IntegrationTests/src/bkr/inttest/client/test_common_options.py

@@ -23,7 +23,7 @@ def test_hub(self):
     # https://bugzilla.redhat.com/show_bug.cgi?id=862146
     def test_version(self):
         out = run_client(['bkr', '--version'])
-        self.assert_(re.match(r'\d+\.[.a-zA-Z0-9]+$', out), out)
+        self.assertTrue(re.match(r'\d+\.[.a-zA-Z0-9]+$', out), out)
 
     # https://bugzilla.redhat.com/show_bug.cgi?id=1345735
     def test_insecure(self):
@@ -49,7 +49,7 @@ def test_on_error_warns_if_server_version_does_not_match(self):
             self.fail('should raise')
         except ClientError as e:
             error_lines = e.stderr_output.splitlines()
-            self.assertEquals(error_lines[0],
+            self.assertEqual(error_lines[0],
                     'WARNING: client version is %s but server version is 999.3'
                     % __version__)
             self.assertIn('HTTP error: 404 Client Error: Not Found',

IntegrationTests/src/bkr/inttest/client/test_distro_trees_list.py

@@ -20,23 +20,23 @@ def setUp(self):
     def test_list_by_distro_name(self):
         output = run_client(['bkr', 'distro-trees-list', '--format=json', '--name', self.distro_tree.distro.name])
         trees = json.loads(output)
-        self.assertEquals(len(trees), 1)
-        self.assertEquals(trees[0]['distro_tree_id'], self.distro_tree.id)
-        self.assertEquals(trees[0]['distro_name'], self.distro_tree.distro.name)
+        self.assertEqual(len(trees), 1)
+        self.assertEqual(trees[0]['distro_tree_id'], self.distro_tree.id)
+        self.assertEqual(trees[0]['distro_name'], self.distro_tree.distro.name)
 
     def test_list_by_distro_id(self):
         output = run_client(['bkr', 'distro-trees-list', '--format=json', '--distro-id', str(self.distro_tree.distro.id)])
         trees = json.loads(output)
-        self.assertEquals(len(trees), 1)
-        self.assertEquals(trees[0]['distro_tree_id'], self.distro_tree.id)
-        self.assertEquals(trees[0]['distro_name'], self.distro_tree.distro.name)
+        self.assertEqual(len(trees), 1)
+        self.assertEqual(trees[0]['distro_tree_id'], self.distro_tree.id)
+        self.assertEqual(trees[0]['distro_name'], self.distro_tree.distro.name)
 
     def test_list_by_distro_tree_id(self):
         output = run_client(['bkr', 'distro-trees-list', '--format=json', '--distro-tree-id', str(self.distro_tree.id)])
         trees = json.loads(output)
-        self.assertEquals(len(trees), 1)
-        self.assertEquals(trees[0]['distro_tree_id'], self.distro_tree.id)
-        self.assertEquals(trees[0]['distro_name'], self.distro_tree.distro.name)
+        self.assertEqual(len(trees), 1)
+        self.assertEqual(trees[0]['distro_tree_id'], self.distro_tree.id)
+        self.assertEqual(trees[0]['distro_name'], self.distro_tree.distro.name)
 
     def test_exits_with_error_if_none_match(self):
         try:
@@ -59,8 +59,8 @@ def test_filtering_by_lab_controller(self):
                     lab_controller=bad_lc, url=u'http://notimportant'))
         output = run_client(['bkr', 'distro-trees-list', '--format=json', '--labcontroller', good_lc.fqdn])
         trees = json.loads(output)
-        self.assert_(any(distro_tree_in.id == tree['distro_tree_id'] for tree in trees))
-        self.assert_(not any(distro_tree_out.id == tree['distro_tree_id'] for tree in trees))
+        self.assertTrue(any(distro_tree_in.id == tree['distro_tree_id'] for tree in trees))
+        self.assertTrue(not any(distro_tree_out.id == tree['distro_tree_id'] for tree in trees))
 
     # https://bugzilla.redhat.com/show_bug.cgi?id=736989
     def test_filtering_by_treepath(self):
@@ -74,26 +74,26 @@ def test_filtering_by_treepath(self):
                     lab_controller=lc, url=u'nfs://example.com/nowhere/'))
         output = run_client(['bkr', 'distro-trees-list', '--format=json', '--treepath', '%somewhere%'])
         trees = json.loads(output)
-        self.assert_(any(distro_tree_in.id == tree['distro_tree_id'] for tree in trees))
-        self.assert_(not any(distro_tree_out.id == tree['distro_tree_id'] for tree in trees))
+        self.assertTrue(any(distro_tree_in.id == tree['distro_tree_id'] for tree in trees))
+        self.assertTrue(not any(distro_tree_out.id == tree['distro_tree_id'] for tree in trees))
 
     # https://bugzilla.redhat.com/show_bug.cgi?id=835319
     def test_tabular_format_works(self):
         output = run_client(['bkr', 'distro-trees-list', '--format=tabular',
                 '--name', self.distro_tree.distro.name])
-        self.assert_('Name: %s' % self.distro_tree.distro.name in output, output)
-        self.assert_('Arch: %s' % self.distro_tree.arch in output, output)
-        self.assert_('Variant: %s' % self.distro_tree.variant in output, output)
-        self.assert_('OSVersion: %s' % self.distro_tree.distro.osversion in output, output)
+        self.assertTrue('Name: %s' % self.distro_tree.distro.name in output, output)
+        self.assertTrue('Arch: %s' % self.distro_tree.arch in output, output)
+        self.assertTrue('Variant: %s' % self.distro_tree.variant in output, output)
+        self.assertTrue('OSVersion: %s' % self.distro_tree.distro.osversion in output, output)
 
     def test_xml_filter(self):
         output = run_client(['bkr', 'distro-trees-list', '--format=json',
                 '--xml-filter',
                 '<distro_name value="%s" />' % self.distro_tree.distro.name])
         trees = json.loads(output)
-        self.assertEquals(len(trees), 1)
-        self.assertEquals(trees[0]['distro_tree_id'], self.distro_tree.id)
-        self.assertEquals(trees[0]['distro_name'], self.distro_tree.distro.name)
+        self.assertEqual(len(trees), 1)
+        self.assertEqual(trees[0]['distro_tree_id'], self.distro_tree.id)
+        self.assertEqual(trees[0]['distro_name'], self.distro_tree.distro.name)
 
     def test_output_is_ordered_by_date_created(self):
         with session.begin():

IntegrationTests/src/bkr/inttest/client/test_distro_trees_verify.py

@@ -21,5 +21,5 @@ def setUp(self):
     def test_verify_distro(self):
         output = run_client(['bkr', 'distro-trees-verify', '--name', self.distro_tree.distro.name])
         lines = output.splitlines()
-        self.assert_(self.distro_tree.distro.name in lines[0])
-        self.assertEquals(lines[1], "missing from labs ['dodgylc.example.invalid']")
+        self.assertTrue(self.distro_tree.distro.name in lines[0])
+        self.assertEqual(lines[1], "missing from labs ['dodgylc.example.invalid']")

IntegrationTests/src/bkr/inttest/client/test_distros_edit_version.py

@@ -17,5 +17,5 @@ def test_edit_distro_version(self):
                     'SillyVersion2.1'])
         with session.begin():
             session.refresh(distro)
-            self.assertEquals(distro.osversion.osmajor.osmajor, u'SillyVersion2')
-            self.assertEquals(distro.osversion.osminor, u'1')
+            self.assertEqual(distro.osversion.osmajor.osmajor, u'SillyVersion2')
+            self.assertEqual(distro.osversion.osminor, u'1')

IntegrationTests/src/bkr/inttest/client/test_distros_list.py

@@ -21,21 +21,21 @@ def setUp(self):
     def test_list_distro(self):
         output = run_client(['bkr', 'distros-list', '--format=json', '--name', self.distro.name])
         distros = json.loads(output)
-        self.assertEquals(len(distros), 1)
-        self.assertEquals(distros[0]['distro_id'], self.distro.id)
-        self.assertEquals(distros[0]['distro_name'], self.distro.name)
+        self.assertEqual(len(distros), 1)
+        self.assertEqual(distros[0]['distro_id'], self.distro.id)
+        self.assertEqual(distros[0]['distro_name'], self.distro.name)
 
     def test_list_distro_id(self):
         output = run_client(['bkr', 'distros-list', '--format=json', '--distro-id', str(self.distro.id)])
         distros = json.loads(output)
-        self.assertEquals(len(distros), 1)
-        self.assertEquals(distros[0]['distro_id'], self.distro.id)
-        self.assertEquals(distros[0]['distro_name'], self.distro.name)
+        self.assertEqual(len(distros), 1)
+        self.assertEqual(distros[0]['distro_id'], self.distro.id)
+        self.assertEqual(distros[0]['distro_name'], self.distro.name)
 
     def test_list_distro_limit(self):
         output = run_client(['bkr', 'distros-list', '--format=json', '--limit=1'])
         distros = json.loads(output)
-        self.assertEquals(len(distros), 1)
+        self.assertEqual(len(distros), 1)
 
     def test_exits_with_error_if_none_match(self):
         try:

IntegrationTests/src/bkr/inttest/client/test_distros_tag.py

@@ -17,7 +17,7 @@ def test_tag_distro(self):
         run_client(['bkr', 'distros-tag', '--name', self.distro.name, 'LOL'])
         with session.begin():
             session.refresh(self.distro)
-            self.assert_(u'LOL' in self.distro.tags)
+            self.assertTrue(u'LOL' in self.distro.tags)
 
     def test_cannot_add_empty_tag(self):
         try:

IntegrationTests/src/bkr/inttest/client/test_distros_untag.py

@@ -16,4 +16,4 @@ def test_untag_distro(self):
         run_client(['bkr', 'distros-untag', '--name', self.distro.name, 'RELEASED'])
         with session.begin():
             session.refresh(self.distro)
-            self.assertEquals(self.distro.tags, [u'STABLE'])
+            self.assertEqual(self.distro.tags, [u'STABLE'])

IntegrationTests/src/bkr/inttest/client/test_group_create.py

@@ -22,25 +22,25 @@ def test_group_create(self):
         out = run_client(['bkr', 'group-create',
                           '--display-name', display_name,
                           group_name])
-        self.assert_('Group created' in out, out)
+        self.assertTrue('Group created' in out, out)
         with session.begin():
             group = Group.by_name(group_name)
-            self.assertEquals(group.display_name, display_name)
-            self.assertEquals(group.activity[-1].action, u'Added')
-            self.assertEquals(group.activity[-1].field_name, u'Owner')
-            self.assertEquals(group.activity[-1].new_value, data_setup.ADMIN_USER)
-            self.assertEquals(group.activity[-1].service, u'HTTP')
-            self.assertEquals(group.activity[-2].action, u'Added')
-            self.assertEquals(group.activity[-2].field_name, u'User')
-            self.assertEquals(group.activity[-2].new_value, data_setup.ADMIN_USER)
-            self.assertEquals(group.activity[-2].service, u'HTTP')
-            self.assertEquals(group.activity[-3].action, u'Created')
-            self.assertEquals(group.activity[-3].service, u'HTTP')
+            self.assertEqual(group.display_name, display_name)
+            self.assertEqual(group.activity[-1].action, u'Added')
+            self.assertEqual(group.activity[-1].field_name, u'Owner')
+            self.assertEqual(group.activity[-1].new_value, data_setup.ADMIN_USER)
+            self.assertEqual(group.activity[-1].service, u'HTTP')
+            self.assertEqual(group.activity[-2].action, u'Added')
+            self.assertEqual(group.activity[-2].field_name, u'User')
+            self.assertEqual(group.activity[-2].new_value, data_setup.ADMIN_USER)
+            self.assertEqual(group.activity[-2].service, u'HTTP')
+            self.assertEqual(group.activity[-3].action, u'Created')
+            self.assertEqual(group.activity[-3].service, u'HTTP')
 
         group_name = data_setup.unique_name(u'group%s')
         out = run_client(['bkr', 'group-create',
                           group_name])
-        self.assert_('Group created' in out, out)
+        self.assertTrue('Group created' in out, out)
 
         with session.begin():
             group = Group.by_name(group_name)
@@ -54,7 +54,7 @@ def test_group_create(self):
                             group_name, group_name])
             self.fail('Must fail or die')
         except ClientError as e:
-            self.assert_('Exactly one group name must be specified' in
+            self.assertTrue('Exactly one group name must be specified' in
                          e.stderr_output, e.stderr_output)
         try:
             _ = run_client(['bkr', 'group-create',
@@ -86,8 +86,8 @@ def test_ldap_group(self):
                         group_name])
 
         group = Group.by_name(group_name)
-        self.assertEquals(group.membership_type, GroupMembershipType.ldap)
-        self.assertEquals(group.users, [User.by_user_name(u'asaha')])
+        self.assertEqual(group.membership_type, GroupMembershipType.ldap)
+        self.assertEqual(group.users, [User.by_user_name(u'asaha')])
 
         with session.begin():
             rand_user = data_setup.create_user(password='asdf')
@@ -104,7 +104,7 @@ def test_ldap_group(self):
                            config=rand_client_config)
             self.fail('Must fail or die')
         except ClientError as e:
-            self.assert_('Only admins can create LDAP groups' in
+            self.assertTrue('Only admins can create LDAP groups' in
                          e.stderr_output)
 
     # https://bugzilla.redhat.com/show_bug.cgi?id=1043772
@@ -155,13 +155,13 @@ def test_group_duplicate(self):
                           '--display-name', display_name,
                           group_name])
 
-        self.assert_('Group created' in out, out)
+        self.assertTrue('Group created' in out, out)
 
         try:
             _ = run_client(['bkr', 'group-create', group_name])
             self.fail('Must fail or die')
         except ClientError as e:
-            self.assert_('Group already exists' in e.stderr_output,
+            self.assertTrue('Group already exists' in e.stderr_output,
                          e.stderr_output)
 
     # https://bugzilla.redhat.com/show_bug.cgi?id=960359
@@ -171,7 +171,7 @@ def test_group_description(self):
         out = run_client(['bkr', 'group-create',
                           '--description', description,
                           group_name])
-        self.assert_('Group created' in out, out)
+        self.assertTrue('Group created' in out, out)
         with session.begin():
             group = Group.by_name(group_name)
-            self.assertEquals(group.description, description)
+            self.assertEqual(group.description, description)

IntegrationTests/src/bkr/inttest/client/test_group_list.py

@@ -30,8 +30,8 @@ def test_list_groups_limit(self):
         groups1 = out1.split()
         out2 = run_client(['bkr', 'group-list', '--limit=1'])
         groups2 = out2.split()
-        self.assertEquals(len(groups2), 1)
-        self.assertEquals(groups1[0], groups2[0])
+        self.assertEqual(len(groups2), 1)
+        self.assertEqual(groups1[0], groups2[0])
 
     def test_list_group_of_owner_that_has_no_group(self):
         with session.begin():

IntegrationTests/src/bkr/inttest/client/test_group_members.py

@@ -25,21 +25,21 @@ def test_group_members(self):
                           '--format','list',
                           group.group_name])
 
-        self.assert_('%s %s %s' %
+        self.assertTrue('%s %s %s' %
                      (user2.user_name, user2.email_address, 'Owner')
                      in out.splitlines(), out.splitlines())
-        self.assert_('%s %s %s' %
+        self.assertTrue('%s %s %s' %
                      (user1.user_name, user1.email_address, 'Member')
                      in out.splitlines(), out.splitlines())
 
         # json output
         out = run_client(['bkr', 'group-members',
                           group.group_name])
         out = json.loads(out)
-        self.assert_(dict(username=user2.user_name,
+        self.assertTrue(dict(username=user2.user_name,
                           email=user2.email_address,
                           owner=True) in out, out)
-        self.assert_(dict(username=user1.user_name,
+        self.assertTrue(dict(username=user1.user_name,
                           email=user1.email_address,
                           owner=False) in out, out)
 
@@ -59,4 +59,4 @@ def test_escapes_uri_characters_in_group_name(self):
             group = data_setup.create_group(group_name=bad_group_name)
         out = run_client(['bkr', 'group-members', bad_group_name])
         out = json.loads(out)
-        self.assertEquals(len(out), 1)
+        self.assertEqual(len(out), 1)