PR#4239: unittest: use unittest.mock instead of mock - koji

koji

#4239 unittest: use unittest.mock instead of mock

Merged 8 months ago by mikem. Opened 8 months ago by julian8628.

julian8628/koji unittest-mock into master

unittest: use unittest.mock instead of mock

Yuming Zhu • 8 months ago

ca05418

tests/test_builder/test_build_notification.py

file modified

+4 -3

		`@@ -1,13 +1,14 @@`
		`from __future__ import absolute_import`

		`- import json`
		`import locale`
		`import os`
		`import tempfile`
		`import time`
		`import unittest`
		`-`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import shutil`
		`import six`

tests/test_builder/test_buildroot_logs.py

file modified

+4 -4

		`@@ -1,13 +1,13 @@`
		`from __future__ import absolute_import`
		`import logging`
		`- import mock`
		`import os`
		`import shutil`
		`import tempfile`
		`import unittest`
		`-`
		`- import koji.daemon`
		`- import koji`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`from .loadkojid import kojid`

tests/test_builder/test_choose_taskarch.py

file modified

+10 -4

		`@@ -1,12 +1,18 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`- import rpm`
		`- import shutil`
		`+`
		`import tempfile`
		`import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`+`
		`+ import rpm`
		`+ import shutil`
		`+ from six.moves import range`
		`+`
		`import koji`
		`from .loadkojid import kojid`
		`- from six.moves import range`


		`class FakeHeader(dict):`

tests/test_builder/test_get_next_task.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji.daemon`
		`import koji`

tests/test_builder/test_main.py

file modified

+4 -2

		`@@ -1,8 +1,10 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`import signal`
		`import unittest`
		`- from six.moves import range`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji`
		`from .loadkojid import kojid`

tests/test_builder/test_taskparams.py

file modified

+5 -1

		`@@ -1,8 +1,12 @@`
		`from __future__ import absolute_import`
		`import inspect`
		`- import mock`
		`import sys`
		`import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`+`
		`import koji`
		`import koji.tasks`

tests/test_builder/test_volume_id.py

file modified

+9 -3

		`@@ -1,10 +1,16 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`- import shutil`
		`+ import logging`
		`import tempfile`
		`import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`+`
		`+ import shutil`
		`+`
		`from .loadkojid import kojid`
		`- import logging`
		`+`

		`logger = logging.getLogger(__name__)`

tests/test_cli/fakeclient.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import koji`

		`from koji.xmlrpcplus import Fault`

tests/test_cli/test_activate_session.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import shutil`
		`import tempfile`
		`import unittest`

tests/test_cli/test_add_channel.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`import koji`

tests/test_cli/test_add_external_repo.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`from koji_cli.commands import handle_add_external_repo`

tests/test_cli/test_add_group.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_add_group_pkg.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`from koji_cli.commands import handle_add_group_pkg`

tests/test_cli/test_add_group_req.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`from koji_cli.commands import handle_add_group_req`

tests/test_cli/test_add_host.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`import koji`

tests/test_cli/test_add_host_to_channel.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_add_notification.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`import koji`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`from koji_cli.commands import handle_add_notification`

tests/test_cli/test_add_pkg.py

file modified

+6 -2

		`@@ -1,11 +1,15 @@`
		`from __future__ import absolute_import`

		`import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`

		`- import mock`
		`import six`
		`import koji`
		`- from mock import call`

		`from koji_cli.commands import handle_add_pkg`
		`from . import utils`

tests/test_cli/test_add_tag.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`from koji_cli.commands import handle_add_tag`

tests/test_cli/test_add_tag_inheritance.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_add_target.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji`
		`from koji_cli.commands import handle_add_target`

tests/test_cli/test_add_user.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`
		`import koji`

tests/test_cli/test_add_volume.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`
		`import koji`

tests/test_cli/test_assign_task.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_block_group.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import koji`

tests/test_cli/test_block_group_pkg.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`from koji_cli.commands import handle_block_group_pkg`

tests/test_cli/test_block_group_req.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`from koji_cli.commands import handle_block_group_req`

tests/test_cli/test_block_notification.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_block_pkg.py

file modified

+6 -3

		`@@ -1,11 +1,14 @@`
		`from __future__ import absolute_import`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`

		`- import mock`
		`import six`
		`- from mock import call`

		`from koji_cli.commands import handle_block_pkg`
		`-`
		`import koji`
		`from . import utils`

tests/test_cli/test_build.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`from koji_cli.commands import handle_build, _progress_callback`

tests/test_cli/test_buildinfo.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`import koji`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import time`
		`import copy`

tests/test_cli/test_call.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`import json`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`
		`import koji`

tests/test_cli/test_cancel.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji`
		`import six`

tests/test_cli/test_chain_build.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_clone_tag.py

file modified

+8 -5

		`@@ -1,12 +1,15 @@`
		`from __future__ import absolute_import`
		`-`
		`- import mock`
		`import os`
		`- import six`
		`import time`
		`- from mock import call`
		`-`
		`import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`
		`+`
		`+ import six`

		`import koji`
		`from koji_cli.commands import handle_clone_tag`

tests/test_cli/test_disable_channel.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`import koji`

tests/test_cli/test_disable_host.py

file modified

+8 -3

		`@@ -1,9 +1,14 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`- import six`
		`import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`
		`+`
		`+ import six`

		`- from mock import call`
		`from koji_cli.commands import handle_disable_host`
		`from . import utils`

tests/test_cli/test_disable_user.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_dist_repo.py

file modified

+4 -1

		`@@ -4,7 +4,10 @@`
		`import unittest`
		`import copy`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`from koji_cli.commands import handle_dist_repo`

tests/test_cli/test_download_build.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_download_file.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import shutil`
		`import tempfile`

tests/test_cli/test_download_logs.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`from koji_cli.commands import anon_handle_download_logs`

tests/test_cli/test_download_task.py

file modified

+6 -2

		`@@ -2,10 +2,14 @@`

		`import os`
		`import sys`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`

		`- import mock`
		`import six`
		`- from mock import call`

		`from koji_cli.commands import anon_handle_download_task`
		`from . import utils`

tests/test_cli/test_edit_channel.py

file modified

+4 -1

		`@@ -3,7 +3,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji`
		`from koji_cli.commands import handle_edit_channel`

tests/test_cli/test_edit_external_repo.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`# coding=utf-8`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_edit_host.py

file modified

+8 -4

		`@@ -1,11 +1,15 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`- import six`
		`import unittest`
		`- import koji`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`

		`- from mock import call`
		`+ import six`

		`+ import koji`
		`from koji_cli.commands import handle_edit_host`
		`from . import utils`

tests/test_cli/test_edit_notification.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`import koji`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`from koji_cli.commands import handle_edit_notification`
		`from . import utils`

tests/test_cli/test_edit_permission.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import koji`
		`import six`

tests/test_cli/test_edit_tag.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import koji`

tests/test_cli/test_edit_tag_inheritance.py

file modified

+6 -3

		`@@ -1,7 +1,10 @@`
		`from __future__ import absolute_import`
		`-`
		`- import mock`
		`- from mock import call`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`

		`import koji`
		`from koji_cli.commands import handle_edit_tag_inheritance`

tests/test_cli/test_edit_target.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import copy`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_edit_user.py

file modified

+4 -1

		`@@ -3,7 +3,10 @@`
		`import unittest`

		`import six`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import koji`

tests/test_cli/test_enable_channel.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import koji`

tests/test_cli/test_enable_host.py

file modified

+9 -4

		`@@ -1,10 +1,15 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`- import six`
		`import unittest`
		`- import koji`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`

		`- from mock import call`
		`+ import six`
		`+`
		`+ import koji`
		`from koji_cli.commands import handle_enable_host`
		`from . import utils`

tests/test_cli/test_enable_user.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`
		`import koji`

tests/test_cli/test_free_task.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`from koji_cli.commands import handle_free_task`

tests/test_cli/test_get_options.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import optparse`

		`import koji`

tests/test_cli/test_grant_cg_access.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`from koji_cli.commands import handle_grant_cg_access`

tests/test_cli/test_grant_permission.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`
		`import koji`

tests/test_cli/test_hello.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`# coding=utf-8`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_hostinfo.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import time`
		`import locale`

tests/test_cli/test_image_build.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import os`
		`import unittest`

tests/test_cli/test_image_build_indirection.py

file modified

+4 -1

		`@@ -3,7 +3,10 @@`
		`import os`
		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`import koji`

tests/test_cli/test_import.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import six`
		`import unittest`

tests/test_cli/test_import_archive.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji`
		`from koji_cli.commands import handle_import_archive`

tests/test_cli/test_import_cg.py

file modified

+9 -6

		`@@ -1,15 +1,18 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ import os`
		`+ import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`
		`+`
		`import six`

		`- from mock import call`
		`from koji_cli.commands import handle_import_cg`
		`from . import utils`

		`- import os`
		`-`
		`- import unittest`
		`-`

		`class TestImportCG(utils.CliTestCase):`
		`def mock_os_path_exists(self, filepath):`

tests/test_cli/test_import_comps.py

file modified

+4 -1

		`@@ -7,7 +7,10 @@`
		`import pytest`
		`import koji`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`try:`

tests/test_cli/test_import_sig.py

file modified

+8 -3

		`@@ -1,13 +1,18 @@`
		`from __future__ import absolute_import`
		`import copy`
		`import hashlib`
		`- import mock`
		`+ import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`
		`import random`
		`+`
		`import six`
		`from six.moves import range`
		`- import unittest`

		`- from mock import call`
		`from koji.util import base64encode`
		`from koji_cli.commands import handle_import_sig`
		`from . import utils`

tests/test_cli/test_latest_build.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`from koji_cli.commands import anon_handle_latest_build`
		`from . import utils`

tests/test_cli/test_list_api.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_list_buildroot.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_list_builds.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import time`
		`from six.moves import StringIO`

tests/test_cli/test_list_channels.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_list_commands.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import six`
		`import unittest`

tests/test_cli/test_list_external_repos.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import time`
		`from six.moves import StringIO`

tests/test_cli/test_list_groups.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import time`
		`import unittest`

tests/test_cli/test_list_history.py

file modified

+4 -1

		`@@ -7,7 +7,10 @@`
		`import unittest`

		`from six.moves import StringIO`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji`
		`from koji_cli.commands import anon_handle_list_history`

tests/test_cli/test_list_hosts.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import time`
		`import locale`

tests/test_cli/test_list_notifications.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_list_permissions.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_list_pkgs.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import copy`
		`import os`
		`import time`

tests/test_cli/test_list_signed.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`
		`import koji`

tests/test_cli/test_list_tag_inheritance.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji`
		`from koji_cli.commands import anon_handle_list_tag_inheritance`

tests/test_cli/test_list_tagged.py

file modified

+4 -1

		`@@ -1,7 +1,10 @@`
		`import os`
		`import time`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`from koji_cli.commands import anon_handle_list_tagged`

tests/test_cli/test_list_tags.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_list_targets.py

file modified

+4 -1

		`@@ -4,7 +4,10 @@`
		`from optparse import Values`

		`import six`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji`
		`from koji_cli.commands import anon_handle_list_targets`

tests/test_cli/test_list_tasks.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`import koji`

tests/test_cli/test_list_untagged.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`import koji`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`
		`from six.moves import StringIO`

tests/test_cli/test_list_users.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_list_volumes.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_load_plugins.py

file modified

+4 -1

		`@@ -4,7 +4,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`from . import loadcli`

tests/test_cli/test_lock_tag.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_make_task.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`import koji`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`from koji_cli.commands import handle_make_task`

tests/test_cli/test_maven_build.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import optparse`
		`import os`
		`import six`

tests/test_cli/test_maven_chain.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_mock_config.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import koji`

tests/test_cli/test_move_build.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`from koji_cli.commands import handle_move_build`

tests/test_cli/test_promote_build.py

file modified

+4 -1

		`@@ -1,7 +1,10 @@`
		`from __future__ import absolute_import`
		`import koji`
		`import locale`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import time`
		`from six.moves import StringIO`

tests/test_cli/test_prune_signed_copies.py

file modified

+4 -1

		`@@ -1,7 +1,10 @@`
		`from __future__ import absolute_import`

		`import koji`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import six`
		`import time`

tests/test_cli/test_regen_repo.py

file modified

+4 -1

		`@@ -4,7 +4,10 @@`
		`import unittest`
		`import copy`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`from koji_cli.commands import handle_regen_repo`

tests/test_cli/test_remove_external_repo.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`from koji_cli.commands import handle_remove_external_repo`

tests/test_cli/test_remove_group.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`

		`from koji_cli.commands import handle_remove_group`

tests/test_cli/test_remove_host_from_channel.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import six`
		`import sys`

tests/test_cli/test_remove_notification.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_remove_pkg.py

file modified

+6 -3

		`@@ -1,13 +1,16 @@`
		`from __future__ import absolute_import`

		`import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`

		`- import mock`
		`import six`
		`- from mock import call`

		`from koji_cli.commands import handle_remove_pkg`
		`-`
		`import koji`
		`from . import utils`

tests/test_cli/test_remove_sig.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji`
		`from koji_cli.commands import handle_remove_sig`

tests/test_cli/test_remove_tag.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_remove_tag_inheritance.py

file modified

+6 -2

		`@@ -1,7 +1,11 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`- from mock import call`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`

		`import koji`
		`from koji_cli.commands import handle_remove_tag_inheritance`

tests/test_cli/test_remove_target.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_repoinfo.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import shutil`
		`import six`
		`import tempfile`

tests/test_cli/test_restart_host.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_resubmit.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`from __future__ import print_function`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_revoke_cg_access.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_revoke_permission.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_rpminfo.py

file modified

+4 -1

		`@@ -1,7 +1,10 @@`
		`from __future__ import absolute_import`
		`import koji`
		`import locale`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import time`
		`from six.moves import StringIO`

tests/test_cli/test_running_in_bg.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`from koji_cli.lib import _running_in_bg`

tests/test_cli/test_search.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_set_build_volume.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_set_pkg_arches.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_set_pkg_owner.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_set_pkg_owner_global.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_set_task_priority.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_show_groups.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import pprint`
		`from six.moves import StringIO`

tests/test_cli/test_spin_commands.py

file modified

+4 -1

		`@@ -3,7 +3,10 @@`
		`import unittest`

		`import six`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import koji`
		`from koji_cli.commands import handle_spin_livecd, handle_spin_livemedia, handle_spin_appliance, \`

tests/test_cli/test_tag_build.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_taginfo.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_taskinfo.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import, print_function`
		`import collections`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import time`
		`import unittest`

tests/test_cli/test_unblock_group_pkg.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`from koji_cli.commands import handle_unblock_group_pkg`

tests/test_cli/test_unblock_group_req.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`from koji_cli.commands import handle_unblock_group_req`

tests/test_cli/test_unblock_notification.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_unblock_pkg.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_unlock_tag.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_untag_build.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_upload_progress_callback.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_userinfo.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_version.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_wait_repo.py

file modified

+4 -1

		`@@ -5,7 +5,10 @@`
		`import unittest`
		`import copy`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import pytest`
		`import six`

tests/test_cli/test_watch_logs.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`
		`from six.moves import StringIO`

tests/test_cli/test_watch_tasks.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`import json`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import six`
		`import sys`

tests/test_cli/test_win_build.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_wrapper_rpm.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_cli/test_write_signed_rpm.py

file modified

+8 -3

		`@@ -1,10 +1,15 @@`
		`from __future__ import absolute_import`
		`import hashlib`
		`- import mock`
		`- import six`
		`import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call`
		`+`
		`+ import six`

		`- from mock import call`
		`import koji`
		`from koji_cli.commands import handle_write_signed_rpm`
		`from . import utils`

tests/test_cli/utils.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import print_function`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import six`
		`import sys`

tests/test_hub/test_add_archivetype.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_add_btype.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_add_channel.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_add_external_repo_to_tag.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_add_external_rpm.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_add_group_member.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_add_host.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_add_host_to_channel.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_add_rpm_sig.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import base64`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import unittest`

tests/test_hub/test_add_user_krb_principal.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_add_volume.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_auto_arch_refuse.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import datetime`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_build.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`


		`class TestBuild(unittest.TestCase):`

tests/test_hub/test_build_image.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`


		`class TestBuildImage(unittest.TestCase):`

tests/test_hub/test_build_image_indirection.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`


		`class TestBuildImageIndirection(unittest.TestCase):`

tests/test_hub/test_build_image_oz.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`


		`class TestBuildImageOz(unittest.TestCase):`

tests/test_hub/test_build_notification.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import unittest`

tests/test_hub/test_bulkupdate_processor.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`from kojihub import db`

tests/test_hub/test_cancel_build.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# coding: utf-8`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_cg_importer.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import shutil`
		`import tempfile`

tests/test_hub/test_chain_build.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`


		`class TestChainBuild(unittest.TestCase):`

tests/test_hub/test_chain_maven.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`


		`class TestChainMaven(unittest.TestCase):`

tests/test_hub/test_check_volume_policy.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import koji.policy`

tests/test_hub/test_complete_image_build.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import copy`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import os.path`
		`import shutil`

tests/test_hub/test_complete_maven_build.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import copy`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import os.path`
		`import shutil`

tests/test_hub/test_create_build_target.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# coding: utf-8`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_create_external_repo.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# coding: utf-8`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_create_image_build.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_create_maven_build.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_create_notification.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_create_notification_block.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_create_rpm_checksum.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import kojihub`

tests/test_hub/test_create_tag.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# coding: utf-8`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_create_user.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_create_win_build.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_delete_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import time`
		`import unittest`
		`from collections import defaultdict`

tests/test_hub/test_delete_build_target.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_delete_external_repo.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import kojihub`

tests/test_hub/test_delete_notification.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_delete_notification_block.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_delete_rpm_sig.py

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`import shutil`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_delete_tag.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_disable_channel.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_disable_user.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_dist_repo.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import shutil`
		`import tempfile`

tests/test_hub/test_download_task_output.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_edit_build_target.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_edit_channel.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_edit_external_repo.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# coding: utf-8`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_edit_host.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_edit_permission.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_edit_tag.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# coding: utf-8`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_edit_tag_external_repo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_edit_user.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_enable_channel.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_enable_user.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_ensure_volume_symlink.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import os.path`
		`import shutil`

tests/test_hub/test_find_build_id.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_getPackageID.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`from .utils import DBQueryTestCase`

tests/test_hub/test_getRPM.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import os.path`
		`import shutil`
		`import tempfile`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_getRPMDeps.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import unittest`
		`import koji`

tests/test_hub/test_getRPMFile.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`

		`import os`

		`- import mock`
		`+ from unittest import mock`

		`import unittest`
		`import koji`

tests/test_hub/test_get_active_repos.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub.repos`

tests/test_hub/test_get_archive.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_archive_file.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_get_archive_type.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_get_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_build_config.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import kojihub`

tests/test_hub/test_get_build_logs.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import shutil`
		`import tempfile`

tests/test_hub/test_get_build_notification_block.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import koji`
		`import kojihub`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_get_build_notification_blocks.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_get_build_notifications.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_get_build_target.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_build_targets.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import kojihub`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_get_build_type.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import kojihub`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_get_buildroot.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_get_changelog_entries.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_channel.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_external_repo.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_external_repo_list.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import kojihub`

tests/test_hub/test_get_group_members.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_host.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_image_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import koji`
		`import kojihub`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_get_maven_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import koji`
		`import kojihub`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_get_next_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_get_next_release.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import koji`
		`import kojihub`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_get_notification_recipients.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_get_rpm_checksums.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_session_info.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_get_tag_external_repos.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import kojihub`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_get_tag_groups.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import kojihub`

tests/test_hub/test_get_task_children.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_upload_path.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import os`
		`- import mock`
		`+ from unittest import mock`
		`import shutil`
		`import tempfile`
		`import unittest`

tests/test_hub/test_get_user.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_get_user_groups.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_user_perms.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_get_volume.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_get_win_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import koji`
		`import kojihub`
		`from .utils import DBQueryTestCase`

tests/test_hub/test_grant_cg_access.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# coding: utf-8`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_grant_permissions.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_group_operations.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_group_pkg_operations.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_group_req_operations.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_import_archive.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_import_archive_internal.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_import_build.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import copy`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import shutil`
		`import tempfile`

tests/test_hub/test_import_image_internal.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import shutil`
		`import tempfile`

tests/test_hub/test_import_rpm.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_list_archive_files.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_list_archives.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_list_btypes.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import kojihub`

tests/test_hub/test_list_builds.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import kojihub`

tests/test_hub/test_list_cgs.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import kojihub`
		`import kojihub.kojihub`

tests/test_hub/test_list_channels.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_list_hosts.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_list_packages_simple.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`

		`QP = kojihub.QueryProcessor`

tests/test_hub/test_list_rpms.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_list_tagged.py

file modified

+1 -1

		`@@ -2,7 +2,7 @@`

		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`
		`import copy`

		`QP = kojihub.QueryProcessor`

tests/test_hub/test_list_tagged_archives.py

file modified

+1 -1

		`@@ -2,7 +2,7 @@`

		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`
		`import copy`

		`QP = kojihub.QueryProcessor`

tests/test_hub/test_list_tagged_rpms.py

file modified

+1 -1

		`@@ -2,7 +2,7 @@`

		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`
		`import copy`

		`QP = kojihub.QueryProcessor`

tests/test_hub/test_list_tags.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_list_task_output.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import kojihub`

tests/test_hub/test_list_tasks.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import kojihub`

tests/test_hub/test_list_user_krb_principals.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_list_users.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_lookup_name.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_massTag.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_maven_build.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`


		`class TestMaven(unittest.TestCase):`

tests/test_hub/test_models/test_host.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_multicall.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`from kojihub import kojixmlrpc`

tests/test_hub/test_new_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_new_image_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import kojihub`
		`import kojihub.kojihub`

tests/test_hub/test_new_maven_build.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_new_package.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_new_typed_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import kojihub`

tests/test_hub/test_new_win_build.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_perm_operations.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`

		`- import mock`
		`+ from unittest import mock`

		`import unittest`

tests/test_hub/test_pkglist.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_policy_tests.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_promote_build.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import datetime`
		`import json`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_query_buildroots.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`
		`import kojihub`

		`QP = kojihub.QueryProcessor`

tests/test_hub/test_query_history.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import time`

tests/test_hub/test_query_rpm_sigs.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import kojihub`

tests/test_hub/test_query_view.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_read_tagged_archives.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_read_tagged_builds.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_read_tagged_rpms.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_recycle_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_remove_external_repo_from_tag.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_remove_host_from_channel.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_remove_volume.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_repo_init.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import json`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import shutil`
		`import tempfile`

tests/test_hub/test_repo_requests.py

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`import tempfile`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_repos.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import unittest`
		`import datetime`

tests/test_hub/test_reset_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_restart_hosts.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_revoke_cg_access.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# coding: utf-8`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`
		`import kojihub`

		`UP = kojihub.UpdateProcessor`

tests/test_hub/test_rpmdiff.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import copy`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import unittest`

tests/test_hub/test_scheduler.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import datetime`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_set_build_owner.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import kojihub`

tests/test_hub/test_set_build_timestamp.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import kojihub`

tests/test_hub/test_set_host_enabled.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_set_user_status.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_show_opts.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import re`

tests/test_hub/test_snapshotTag.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_snapshotTagModify.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import koji`
		`import kojihub`

tests/test_hub/test_tag_last_change_event.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import re`
		`try:`

tests/test_hub/test_tag_notification.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import unittest`
		`import kojihub`

tests/test_hub/test_tag_operations.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_task_wait_results.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import xmlrpc.client`
		`import unittest`

tests/test_hub/test_untagged_build.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`

		`import kojihub`
		`import kojihub.kojihub`

tests/test_hub/test_update_notification.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_upsert_processor.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_hub/test_user_groups.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_verify_names.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`
		`import re`

		`import koji`

tests/test_hub/test_win_build.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`


		`class TestWinBuild(unittest.TestCase):`

tests/test_hub/test_wrapper_rpm.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`
		`import kojihub`
		`- import mock`
		`+ from unittest import mock`


		`class TestWrapperRPM(unittest.TestCase):`

tests/test_hub/test_write_inheritance_data.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# coding: utf-8`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/test_write_maven_repo_metadata.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import os`
		`import datetime`
		`import unittest`

tests/test_hub/test_write_signed_rpm.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`import kojihub`

tests/test_hub/utils.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import kojihub`

tests/test_kojira/test_managed_repo.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`from __future__ import absolute_import`
		`import json`
		`- import mock`
		`+ from unittest import mock`
		`import os.path`
		`import shutil`
		`import tempfile`

tests/test_kojira/test_repo_manager.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ from unittest import mock`
		`import os.path`
		`import shutil`
		`import tempfile`

tests/test_lib/test_auth.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import unittest`

tests/test_lib/test_build_label.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import rpm`
		`import unittest`

tests/test_lib/test_client_session.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import weakref`
		`import requests`

tests/test_lib/test_file_ops.py

file modified

+4 -1

		`@@ -2,7 +2,10 @@`

		`import unittest`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import errno`

		`from koji import ensuredir`

tests/test_lib/test_fixEncoding.py

file modified

+4 -1

		`@@ -5,7 +5,10 @@`

		`from __future__ import absolute_import`
		`import koji`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_lib/test_gssapi.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`

		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import unittest`

tests/test_lib/test_insert_processor.py

file modified

+4 -1

		`@@ -1,4 +1,7 @@`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`import koji`

tests/test_lib/test_multicall_session.py

file modified

+4 -1

		`@@ -1,4 +1,7 @@`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`import koji`

tests/test_lib/test_parsers.py

file modified

+4 -1

		`@@ -3,7 +3,10 @@`
		`"""Test the __init__.py module"""`

		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import rpm`
		`import unittest`

tests/test_lib/test_plugin.py

file modified

+4 -1

		`@@ -1,7 +1,10 @@`
		`from __future__ import absolute_import`
		`import copy`
		`import datetime`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import range`
		`import sys`
		`import unittest`

tests/test_lib/test_profiles.py

file modified

+4 -1

		`@@ -3,7 +3,10 @@`
		`import sys`
		`import threading`
		`import traceback`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`from six.moves import range`

		`import unittest`

tests/test_lib/test_query_processor.py

file modified

+4 -1

		`@@ -1,4 +1,7 @@`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`import kojihub`

tests/test_lib/test_repowatcher.py

file modified

+4 -1

		`@@ -1,4 +1,7 @@`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import unittest`

tests/test_lib/test_restart_tasks.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import shutil`
		`import tempfile`
		`import unittest`

tests/test_lib/test_savepoint.py

file modified

+4 -1

		`@@ -1,4 +1,7 @@`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`

		`import unittest`

tests/test_lib/test_tasks.py

file modified

+11 -7

		`@@ -1,16 +1,20 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+`
		`import os`
		`- import random`
		`- import shutil`
		`- import six`
		`- from six.moves import range`
		`+ from os import path, makedirs`
		`import tempfile`
		`import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import patch, MagicMock, Mock, call`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import patch, MagicMock, Mock, call`

		`- from os import path, makedirs`
		`- from mock import patch, MagicMock, Mock, call`
		`import requests_mock`
		`+ import shutil`
		`+ import six`
		`+ from six.moves import range`

		`import koji`
		`from koji.tasks import BaseTaskHandler, FakeTask, ForkTask, SleepTask, WaitTestTask, scan_mounts, \`

tests/test_lib/test_update_processor.py

file modified

+4 -1

		`@@ -1,4 +1,7 @@`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`import kojihub`

tests/test_lib/test_utils.py

file modified

+13 -11

		`@@ -1,30 +1,32 @@`
		`# coding=utf-8`
		`from __future__ import absolute_import`
		`import calendar`
		`+ from datetime import datetime`
		`import errno`
		`import locale`
		`import logging`
		`- from unittest.case import TestCase`
		`- import mock`
		`+ import tempfile`
		`+ import threading`
		`+ import unittest`
		`import multiprocessing`
		`import optparse`
		`import os`
		`import resource`
		`import time`
		`- import six`
		`- import shutil`
		`- import tempfile`
		`- import threading`
		`- import unittest`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import call, patch`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import call, patch`

		`import requests_mock`
		`- from mock import call, patch`
		`- from datetime import datetime`
		`+ import shutil`
		`+ import six`
		`+`
		`import koji`
		`import koji.util`

		`- from koji.util import format_shell_cmd`
		`-`

		`class EnumTestCase(unittest.TestCase):`

tests/test_plugins/test_kiwi_builder.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import tempfile`
		`import unittest`

tests/test_plugins/test_kiwi_cli.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import io`
		`import os`
		`import sys`

tests/test_plugins/test_kiwi_hub.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_plugins/test_protonmsg.py

file modified

+6 -2

		`@@ -6,9 +6,13 @@`
		`import pytest`

		`import protonmsg`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ from unittest.mock import patch, MagicMock`
		`+ except ImportError:`
		`+ import mock`
		`+ from mock import patch, MagicMock`
		`import six`
		`- from mock import patch, MagicMock`
		`if six.PY2:`
		`from ConfigParser import SafeConfigParser as ConfigParser`
		`else:`

tests/test_plugins/test_runroot_builder.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`import copy`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import unittest`

		`import six.moves.configparser`

tests/test_plugins/test_runroot_cli.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`import io`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`
		`import os`

tests/test_plugins/test_runroot_hub.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_plugins/test_save_failed_tree_builder.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import os`
		`import sys`
		`import unittest`

tests/test_plugins/test_save_failed_tree_cli.py

file modified

+4 -1

		`@@ -1,5 +1,8 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`

tests/test_plugins/test_sidetag_cli.py

file modified

+4 -1

		`@@ -1,6 +1,9 @@`
		`from __future__ import absolute_import`
		`import io`
		`- import mock`
		`+ try:`
		`+ from unittest import mock`
		`+ except ImportError:`
		`+ import mock`
		`import six`
		`import unittest`
		`import os`

tests/test_plugins/test_sidetag_hub.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_scm.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`from __future__ import absolute_import`
		`- import mock`
		`+ from unittest import mock`
		`import shutil`
		`import six`
		`import tempfile`

tests/test_www/test_activesessiondelete.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`from __future__ import absolute_import`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`from koji.server import ServerRedirect`
		`from .loadwebindex import webidx`

tests/test_www/test_archiveinfo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`from .loadwebindex import webidx`

tests/test_www/test_archivelist.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`

tests/test_www/test_buildinfo.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`

tests/test_www/test_buildrootinfo.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`

tests/test_www/test_buildtargetcreate.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import cgi`

tests/test_www/test_buildtargetdelete.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`from __future__ import absolute_import`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`

		`import koji`
		`from koji.server import ServerRedirect`

tests/test_www/test_buildtargetedit.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import cgi`

tests/test_www/test_buildtargetinfo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_www/test_cancelbuild.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_canceltask.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_channelinfo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_www/test_disablehost.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_enablehost.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_externalrepoinfo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`from .loadwebindex import webidx`

tests/test_www/test_fileinfo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_www/test_freetask.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_hostedit.py

file modified

+1 -1

		`@@ -2,7 +2,7 @@`
		`import koji`
		`import cgi`

		`- import mock`
		`+ from unittest import mock`
		`from io import BytesIO`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_hostinfo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_www/test_notificationcreate.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import cgi`

tests/test_www/test_notificationdelete.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_notificationedit.py

file modified

+1 -1

		`@@ -2,7 +2,7 @@`
		`import koji`
		`import cgi`

		`- import mock`
		`+ from unittest import mock`
		`from io import BytesIO`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_packageinfo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_www/test_repoinfo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`from .loadwebindex import webidx`

tests/test_www/test_resubmittask.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`import unittest`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_rpminfo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`import koji`

tests/test_www/test_rpmlist.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import koji`

		`- import mock`
		`+ from unittest import mock`
		`from .loadwebindex import webidx`

tests/test_www/test_search.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`
		`import cgi`

tests/test_www/test_tagcreate.py

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`import unittest`
		`import cgi`

		`- import mock`
		`+ from unittest import mock`
		`from io import BytesIO`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_tagdelete.py

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`- import mock`
		`import unittest`
		`+ from unittest import mock`

		`import koji`
		`from .loadwebindex import webidx`

tests/test_www/test_tagedit.py

file modified

+1 -1

		`@@ -2,7 +2,7 @@`
		`import koji`
		`import cgi`

		`- import mock`
		`+ from unittest import mock`
		`from io import BytesIO`
		`from .loadwebindex import webidx`
		`from koji.server import ServerRedirect`

tests/test_www/test_tagparent.py

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`from __future__ import absolute_import`
		`import unittest`
		`- import mock`
		`+ from unittest import mock`
		`import cgi`

		`import koji`

tests/test_www/test_taskinfo.py

file modified

+2 -2

		`@@ -1,9 +1,9 @@`
		`- import mock`
		`+ from unittest import mock`
		`import copy`
		`import datetime`
		`import unittest`

		`- from mock import call`
		`+ from unittest.mock import call`

		`import koji`
		`from .loadwebindex import webidx`

tests/test_www/test_userinfo.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- import mock`
		`+ from unittest import mock`
		`import unittest`

		`from .loadwebindex import webidx`

julian8628 commented 8 months ago

because of the absence of unittest.mock on python2.7, we still fallback to mock

fixes: #4195

Metadata Update from @julian8628:
- Pull-request tagged with: no_qe

8 months ago

4 new commits added

setuptools is required by devtools/check-api (py3)
sort imports in tests/
fix unittest without /usr/bin/python on newer os
unittest: use unittest.mock instead of mock

8 months ago

2 new commits added

sort imports in tests/
unittest: use unittest.mock instead of mock

8 months ago

Metadata Update from @jcupova:
- Pull-request untagged with: no_qe

8 months ago

jcupova commented 8 months ago

dropping no_qe tag until review is completed

mikem commented 8 months ago

This seems fine overall.

Technically, we only need to worry about the fallback import for the py2-relevant tests, but should be harmless to have it everywhere.

You've added a commit to sort imports, which seems reasonable given that we're creating a lot of churn in that area anyway. However, your sort does not quite agree with what isort does for me locally. If I run isort tests, I see a number of changes across hundreds of files on top of what you have here. Mainly:

adding a blank line before relative imports
some additional re-ordering (e.g. moving koji_cli import in tests/test_cli/test_add_host.py)
some adjustments to long import lists

There are a handful of test files that isort wants to change that were not otherwise changed by your PR, but the vast majority overlap with your PR. Are we seeing variation in isort behavior? I've got python3-isort-5.13.2-1.fc39.noarch.

julian8628 commented 8 months ago

Guessing the differences are caused by different isort config here: https://pagure.io/koji/pull-request/4243#_1__23-31

I can drop the import sorting commit and we could probably deal it in #4243

julian8628 commented 8 months ago

Technically, we only need to worry about the fallback import for the py2-relevant tests, but should be harmless to have it everywhere.

I added the fallback import in tests/test_lib so that it can be checked with py2 as well (it would have been added as koji lib still supports py 2.7). I submitted PR #4248 for this

rebased onto 589e6bb

8 months ago

julian8628 commented 8 months ago