more missing tearDowns

tests/test_cli/test_add_channel.py

@@ -26,6 +26,9 @@ class TestAddChannel(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_add_channel(self, stdout):
         self.session.addChannel.return_value = self.channel_id

tests/test_cli/test_add_external_repo.py

@@ -25,6 +25,9 @@ class TestAddExternalRepo(utils.CliTestCase):
         self.tag = 'test-tag'
         self.priority = 10
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_add_external_repo_invalid_mode(self):
         mode = 'test-mode'
         arguments = ['--mode', mode]

tests/test_cli/test_add_group.py

@@ -21,6 +21,9 @@ class TestAddGroup(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_add_group(self, stdout):
         tag = 'tag'

tests/test_cli/test_add_host.py

@@ -19,6 +19,9 @@ class TestAddHost(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_add_host(self, stdout):
         host = 'host'

tests/test_cli/test_add_host_to_channel.py

@@ -19,6 +19,9 @@ class TestAddHostToChannel(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_add_host_to_channel(self, stdout):
         host = 'host'

tests/test_cli/test_add_notification.py

@@ -21,6 +21,9 @@ class TestAddNotification(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_add_notification(self):
         self.session.getPackageID.return_value = 1234
         self.session.getTagID.return_value = 4321

tests/test_cli/test_add_pkg.py

@@ -27,6 +27,9 @@ class TestAddPkg(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_add_pkg(self, stdout):
         tag = 'tag'

tests/test_cli/test_add_tag.py

@@ -21,6 +21,9 @@ class TestAddTag(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_add_tag(self):
         """Test handle_add_tag function"""
         # Case 1. no argument error

tests/test_cli/test_add_tag_inheritance.py

@@ -56,6 +56,9 @@ class TestAddTagInheritance(utils.CliTestCase):
                       'perm': None,
                       'perm_id': None}
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_add_tag_inheritance_without_option(self):
         arguments = []
         expected = self.format_error_message(

tests/test_cli/test_add_target.py

@@ -20,6 +20,9 @@ class TestAddTarget(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_add_target_without_option(self,):
         expected = self.format_error_message(
             "Please specify a target name, a build tag, and destination tag")

tests/test_cli/test_add_user.py

@@ -25,6 +25,9 @@ class TestAddUser(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_add_user(self, stdout):
         """Test handle_add_user function"""

tests/test_cli/test_add_volume.py

@@ -24,6 +24,9 @@ class TestAddVolume(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_add_volume(self, stdout):
         """Test handle_add_volume function"""

tests/test_cli/test_assign_task.py

@@ -24,6 +24,9 @@ class TestAssignTask(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_assign_task(self, stdout):
         hostname = "host"

tests/test_cli/test_block_group.py

@@ -25,6 +25,9 @@ class TestBlockGroup(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_block_group_nonexistent_tag(self):
         tag = 'nonexistent-tag'
         group = 'group'

tests/test_cli/test_block_notification.py

@@ -21,6 +21,9 @@ class TestBlockNotification(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_block_notification_non_exist_tag(self):
         tag = 'test-tag'
         arguments = ['--tag', tag]

tests/test_cli/test_block_pkg.py

@@ -26,6 +26,9 @@ class TestBlockPkg(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_block_pkg(self, stdout):
         tag = 'tag'

tests/test_cli/test_build.py

@@ -48,6 +48,9 @@ https://docs.pagure.org/koji/HOWTO/#package-organization
 %s: error: {message}
 """ % (self.progname, self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_build_from_srpm(self, stdout):
         args = [self.target, self.source_srpm]

tests/test_cli/test_call.py

@@ -29,6 +29,9 @@ Note, that you can use global option --noauth for anonymous calls here
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_call(self, stdout):
         """Test handle_call function"""

tests/test_cli/test_cancel.py

@@ -35,6 +35,9 @@ class TestCancel(utils.CliTestCase):
         self.session.hub_version = (1, 33, 0)
         self.session.hub_version_str = '1.33.0'
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_anon_cancel(self):
         args = ['123']
         self.activate_session_mock.side_effect = koji.GenericError

tests/test_cli/test_chain_build.py

@@ -31,6 +31,9 @@ class TestChainBuild(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_chain_build(self, stdout):
         target = 'target'

tests/test_cli/test_disable_channel.py

@@ -29,6 +29,9 @@ class TestDisableChannel(utils.CliTestCase):
              'name': 'test-channel'}
         ]
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def __vm(self, result):
         m = koji.VirtualCall('mcall_method', [], {})
         if isinstance(result, dict) and result.get('faultCode'):

tests/test_cli/test_disable_host.py

@@ -21,6 +21,9 @@ class TestDisableHost(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_disable_host_no_such_host(self):
         """Test %s function""" % handle_disable_host.__name__
         self.session.getHost.return_value = None

tests/test_cli/test_disable_user.py

@@ -24,6 +24,9 @@ class TestDisableUser(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_disable_user_no_argument(self):
         """Test handle_disable_user function"""
         expected = self.format_error_message(

tests/test_cli/test_edit_external_repo.py

@@ -24,6 +24,9 @@ class TestEditExternalRepo(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_edit_external_repo_error(self):
         """Test handle_edit_external_repo function"""
         # [(expected, args),...]

tests/test_cli/test_edit_host.py

@@ -28,6 +28,9 @@ class TestEditHost(utils.CliTestCase):
         self.description = 'description'
         self.comment = 'comment'
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_edit_host(self, stdout):
         host_info = mock.ANY

tests/test_cli/test_edit_notification.py

@@ -19,6 +19,9 @@ class TestEditNotification(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_edit_notification(self):
         self.session.getPackageID.return_value = 1234
         self.session.getTagID.return_value = 4321

tests/test_cli/test_edit_permission.py

@@ -26,6 +26,9 @@ class TestEditPermission(utils.CliTestCase):
         self.perm = 'test-perm'
         self.description = 'test-description'
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_edit_permission_argument_error(self):
         expected = self.format_error_message("Please specify a permission and a description")
         for args in [[], [self.perm]]:

tests/test_cli/test_edit_tag.py

@@ -30,6 +30,9 @@ class TestEditTag(utils.CliTestCase):
         self.extra = {'extraA': 'A', 'extraB': True}
         self.remove_extra = ['extraC', 'extraD']
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_edit_tag_1(self, stdout):
         args = [self.tag]

tests/test_cli/test_edit_target.py

@@ -42,6 +42,9 @@ class TestEditTarget(utils.CliTestCase):
         self.new_dest_tag = 'new-dest-tag'
         self.new_build_tag = 'new-build-tag'
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_edit_target_without_option(self):
         expected = self.format_error_message("Please specify a build target")
         self.assert_system_exit(

tests/test_cli/test_edit_user.py

@@ -26,6 +26,9 @@ class TestEditUser(utils.CliTestCase):
         self.user = 'user'
         self.rename = 'user2'
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_edit_user(self, stdout):
         args = [self.user]

tests/test_cli/test_enable_channel.py

@@ -30,6 +30,9 @@ class TestEnableChannel(utils.CliTestCase):
              'name': 'test-channel'}
         ]
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def __vm(self, result):
         m = koji.VirtualCall('mcall_method', [], {})
         if isinstance(result, dict) and result.get('faultCode'):

tests/test_cli/test_enable_host.py

@@ -22,6 +22,9 @@ class TestEnableHost(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_enable_host_no_such_host(self):
         """Test %s function""" % handle_enable_host.__name__
 

tests/test_cli/test_enable_user.py

@@ -21,6 +21,9 @@ class TestEnableUser(utils.CliTestCase):
 """ % (self.progname, self.progname)
         self.username = 'user'
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_enable_user_no_argument(self):
         """Test handle_enable_user function"""
         expected = self.format_error_message("You must specify the username of the user to enable")

tests/test_cli/test_free_task.py

@@ -19,6 +19,9 @@ class TestFreeTask(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_free_task_without_arg(self):
         expected = self.format_error_message('please specify at least one task_id')
         self.assert_system_exit(

tests/test_cli/test_grant_cg_access.py

@@ -22,6 +22,9 @@ class TestGrantCGAccess(utils.CliTestCase):
         self.cg = 'cg'
         self.user = 'user'
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_grant_cg_access_arg_error(self):
         """Test handle_grant_cg_access function"""
         expected = self.format_error_message("Please specify a user and content generator")

tests/test_cli/test_grant_permission.py

@@ -26,6 +26,9 @@ class TestGrantPermission(utils.CliTestCase):
         self.perm = 'createuser'
         self.user = 'user'
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_grant_permission_argument_error(self):
         expected = self.format_error_message(
             "Please specify a permission and at least one user")

tests/test_cli/test_hello.py

@@ -39,6 +39,9 @@ class TestHello(utils.CliTestCase):
 """ % (self.progname, self.progname)
         self.huburl = "https://%s.local/%shub" % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.commands._printable_unicode')
     def test_handle_moshimoshi(self, print_unicode_mock, stdout):

tests/test_cli/test_import.py

@@ -84,6 +84,9 @@ class TestImport(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def __do_import_test(self, options, session, arguments, **kwargs):
         expected = kwargs.get('expected', None)
         rpm_header = kwargs.get('rpm_header', {})

tests/test_cli/test_import_archive.py

@@ -23,6 +23,9 @@ class TestImportArchive(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_import_archive_without_option(self):
         expected = self.format_error_message(
             "You must specify a build ID or N-V-R and an archive to import")

tests/test_cli/test_import_cg.py

@@ -34,6 +34,9 @@ class TestImportCG(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.commands._progress_callback')
     @mock.patch('koji.json')

tests/test_cli/test_import_comps.py

@@ -38,6 +38,9 @@ class TestImportComps(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.commands.libcomps')
     @mock.patch('koji_cli.commands._import_comps')

tests/test_cli/test_import_sig.py

@@ -76,6 +76,9 @@ class TestImportSIG(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji.rip_rpm_sighdr')

tests/test_cli/test_list_api.py

@@ -19,6 +19,9 @@ class TestListApi(utils.CliTestCase):
         self.options = mock.MagicMock()
         self.ensure_connection = mock.patch('koji_cli.commands.ensure_connection').start()
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_anon_handle_list_api_all_method(self, stdout):
         """Test anon_handle_list_api function"""

tests/test_cli/test_list_buildroot.py

@@ -22,6 +22,9 @@ class TestListBuilds(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_list_buildroot_without_args(self):
         self.assert_system_exit(
             anon_handle_list_buildroot,

tests/test_cli/test_list_channels.py

@@ -64,6 +64,9 @@ class TestListChannels(utils.CliTestCase):
             ]]
         ]
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=StringIO)
     def test_list_channels_not_quiet(self, stdout):
         self.session.listChannels.return_value = self.list_channels

tests/test_cli/test_list_notifications.py

@@ -23,6 +23,9 @@ class TestListNotifications(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=StringIO)
     def test_list_notifications(self, stdout):
         self.session.getBuildNotifications.return_value = [

tests/test_cli/test_list_permissions.py

@@ -36,6 +36,9 @@ class TestListPermissions(utils.CliTestCase):
         self.user = 'tester'
         self.userinfo = {'id': 101, 'name': self.user}
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_list_permissions_arg_error(self):
         """Test handle_list_permissions argument error (no argument is required)"""
         expected = self.format_error_message("This command takes no arguments")

tests/test_cli/test_list_pkgs.py

@@ -52,6 +52,9 @@ class TestListPkgs(utils.CliTestCase):
                         'perm': None,
                         'perm_id': None}
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_list_pkgs_non_exist_tag(self):
         self.session.getTag.return_value = None
         self.assert_system_exit(

tests/test_cli/test_list_signed.py

@@ -20,6 +20,9 @@ class TestListSigned(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def __vm(self, result):
         m = koji.VirtualCall('mcall_method', [], {})
         if isinstance(result, dict) and result.get('faultCode'):

tests/test_cli/test_list_tags.py

@@ -38,6 +38,9 @@ class TestListTags(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_list_tags_non_exist_package(self):
         pkg = 'test-pkg'
         self.session.getPackage.return_value = None

tests/test_cli/test_mock_config.py

@@ -65,6 +65,9 @@ config_opts['macros']['%distribution'] = 'Koji Testing'
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_mock_config_buildroot_option(self, stdout):
         """Test anon_handle_mock_config buildroot options"""

tests/test_cli/test_remove_external_repo.py

@@ -18,6 +18,9 @@ class TestRemoveExternalRepo(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_remove_external_repo_help(self):
         self.assert_help(
             handle_remove_external_repo,

tests/test_cli/test_remove_pkg.py

@@ -28,6 +28,9 @@ class TestRemovePkg(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stderr', new_callable=six.StringIO)
     def test_handle_remove_pkg(self, stderr):
         tag = 'tag'

tests/test_cli/test_remove_tag_inheritance.py

@@ -50,6 +50,9 @@ class TestRemoveTagInheritance(utils.CliTestCase):
                                 'perm': None,
                                 'perm_id': None}
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_remove_tag_inheritance_without_option(self):
         expected = self.format_error_message(
             "This command takes at least one argument: a tag name or ID")

tests/test_cli/test_restart_host.py

@@ -24,6 +24,9 @@ class TestRestartHosts(utils.CliTestCase):
         self.watch_tasks_mock = mock.patch('koji_cli.commands.watch_tasks').start()
         self.task_id = 101
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_restart_hosts_force_options(self):
         """Test %s function with --force option""" % handle_restart_hosts.__name__
         arguments = ['--force']

tests/test_cli/test_set_task_priority.py

@@ -25,6 +25,9 @@ class TestSetTaskPriority(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_set_task_priority(self, stdout, stderr):

tests/test_cli/test_show_groups.py

@@ -52,6 +52,9 @@ class TestShowGroups(utils.CliTestCase):
              'group_id': 3}
         ]
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_show_groups_incorrect_num_of_args(self):
         arguments = []
         self.assert_system_exit(

tests/test_cli/test_untag_build.py

@@ -34,6 +34,9 @@ class TestUntagBuild(utils.CliTestCase):
                               'name': 'test-package', 'release': '1.f35', 'tag.name': 'test-tag',
                               'tag_id': 460, 'version': '1.1'}]}
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def __vm(self, result):
         m = koji.VirtualCall('mcall_method', [], {})
         if isinstance(result, dict) and result.get('faultCode'):

tests/test_cli/test_watch_logs.py

@@ -21,6 +21,9 @@ class TestWatchLogs(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_handle_watch_logs_help(self):
         self.assert_help(
             anon_handle_watch_logs,

tests/test_cli/test_win_build.py

@@ -39,6 +39,9 @@ class TestWinBuild(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_win_build_without_option(self):
         self.assert_system_exit(
             handle_win_build,

tests/test_hub/test_get_next_release.py

@@ -12,9 +12,6 @@ class TestGetNextRelease(DBQueryTestCase):
         self.get_build = mock.patch('kojihub.kojihub.get_build').start()
         self.binfo = {'name': 'name', 'version': 'version'}
 
-    def tearDown(self):
-        mock.patch.stopall()
-
     def test_get_next_release_new(self):
         # no previous build
         self.qp_execute_one_return_value = None

tests/test_hub/test_get_user.py

@@ -15,9 +15,6 @@ class TestGetUser(DBQueryTestCase):
         self.list_user_krb_principals = mock.patch(
             'kojihub.kojihub.list_user_krb_principals').start()
 
-    def tearDown(self):
-        mock.patch.stopall()
-
     def test_wrong_format_user_info(self):
         userinfo = ['test-user']
         with self.assertRaises(koji.GenericError) as cm:

tests/test_hub/test_models/test_host.py

@@ -32,6 +32,9 @@ class TestHost(unittest.TestCase):
         self.queries = []
         self.query_execute = mock.MagicMock()
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     @mock.patch('kojihub.kojihub.context')
     def test_instantiation_not_a_host(self, context):
         context.session.getHostId.return_value = None

tests/test_hub/test_verify_names.py

@@ -46,6 +46,9 @@ class TestVerifyUser(unittest.TestCase):
         self.context.opts = {'MaxNameLengthInternal': 15,
                              'RegexUserName.compiled': re.compile('^[A-Za-z0-9/_.@-]+$')}
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_verify_user_type_name(self):
         expected_error = "Name should be string"
         with self.assertRaises(koji.GenericError) as cm:

tests/test_lib/test_auth.py

@@ -44,6 +44,9 @@ class TestAuthSession(unittest.TestCase):
         # start with "assert"
         self.context.session.assertLogin = mock.MagicMock()
 
+    def tearDown(self):
+        mock.patch.stopall()
+
     def test_instance(self):
         """Simple kojihub.auth.Session instance"""
         self.context.opts = {