diff --git a/tests/test_builder/test_build_notification.py b/tests/test_builder/test_build_notification.py index 5f09b4bd..b2d10564 100644 --- a/tests/test_builder/test_build_notification.py +++ b/tests/test_builder/test_build_notification.py @@ -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 diff --git a/tests/test_builder/test_buildroot_logs.py b/tests/test_builder/test_buildroot_logs.py index a78d9165..7718d49c 100644 --- a/tests/test_builder/test_buildroot_logs.py +++ b/tests/test_builder/test_buildroot_logs.py @@ -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 diff --git a/tests/test_builder/test_choose_taskarch.py b/tests/test_builder/test_choose_taskarch.py index b24e56cd..98018c62 100644 --- a/tests/test_builder/test_choose_taskarch.py +++ b/tests/test_builder/test_choose_taskarch.py @@ -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): diff --git a/tests/test_builder/test_get_next_task.py b/tests/test_builder/test_get_next_task.py index 166aecf8..7ef97d94 100644 --- a/tests/test_builder/test_get_next_task.py +++ b/tests/test_builder/test_get_next_task.py @@ -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 diff --git a/tests/test_builder/test_main.py b/tests/test_builder/test_main.py index e1480d6b..eb87964e 100644 --- a/tests/test_builder/test_main.py +++ b/tests/test_builder/test_main.py @@ -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 diff --git a/tests/test_builder/test_taskparams.py b/tests/test_builder/test_taskparams.py index 701df020..17bf2fa6 100644 --- a/tests/test_builder/test_taskparams.py +++ b/tests/test_builder/test_taskparams.py @@ -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 diff --git a/tests/test_builder/test_volume_id.py b/tests/test_builder/test_volume_id.py index fe814293..c3dc33e9 100644 --- a/tests/test_builder/test_volume_id.py +++ b/tests/test_builder/test_volume_id.py @@ -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__) diff --git a/tests/test_cli/fakeclient.py b/tests/test_cli/fakeclient.py index d0b07d0f..9a3206bc 100644 --- a/tests/test_cli/fakeclient.py +++ b/tests/test_cli/fakeclient.py @@ -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 diff --git a/tests/test_cli/test_activate_session.py b/tests/test_cli/test_activate_session.py index 7b01998a..15c6c0e1 100644 --- a/tests/test_cli/test_activate_session.py +++ b/tests/test_cli/test_activate_session.py @@ -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 diff --git a/tests/test_cli/test_add_channel.py b/tests/test_cli/test_add_channel.py index 0445e3d7..79754be4 100644 --- a/tests/test_cli/test_add_channel.py +++ b/tests/test_cli/test_add_channel.py @@ -2,7 +2,10 @@ from __future__ import absolute_import import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import six import koji diff --git a/tests/test_cli/test_add_external_repo.py b/tests/test_cli/test_add_external_repo.py index 24cabb40..17596f8e 100644 --- a/tests/test_cli/test_add_external_repo.py +++ b/tests/test_cli/test_add_external_repo.py @@ -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 diff --git a/tests/test_cli/test_add_group.py b/tests/test_cli/test_add_group.py index 97622efb..17fa025c 100644 --- a/tests/test_cli/test_add_group.py +++ b/tests/test_cli/test_add_group.py @@ -1,6 +1,9 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_add_group_pkg.py b/tests/test_cli/test_add_group_pkg.py index dd2fa266..78199093 100644 --- a/tests/test_cli/test_add_group_pkg.py +++ b/tests/test_cli/test_add_group_pkg.py @@ -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 diff --git a/tests/test_cli/test_add_group_req.py b/tests/test_cli/test_add_group_req.py index 9502bb7e..db7c79d7 100644 --- a/tests/test_cli/test_add_group_req.py +++ b/tests/test_cli/test_add_group_req.py @@ -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 diff --git a/tests/test_cli/test_add_host.py b/tests/test_cli/test_add_host.py index 12615b99..e10e89d1 100644 --- a/tests/test_cli/test_add_host.py +++ b/tests/test_cli/test_add_host.py @@ -1,6 +1,9 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import koji diff --git a/tests/test_cli/test_add_host_to_channel.py b/tests/test_cli/test_add_host_to_channel.py index 9dce6672..b6dc0196 100644 --- a/tests/test_cli/test_add_host_to_channel.py +++ b/tests/test_cli/test_add_host_to_channel.py @@ -1,6 +1,9 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_add_notification.py b/tests/test_cli/test_add_notification.py index 6e85bf4e..5ade34b1 100644 --- a/tests/test_cli/test_add_notification.py +++ b/tests/test_cli/test_add_notification.py @@ -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 diff --git a/tests/test_cli/test_add_pkg.py b/tests/test_cli/test_add_pkg.py index 50739da8..5272f878 100644 --- a/tests/test_cli/test_add_pkg.py +++ b/tests/test_cli/test_add_pkg.py @@ -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 diff --git a/tests/test_cli/test_add_tag.py b/tests/test_cli/test_add_tag.py index 5b7b2dd7..04100c9d 100644 --- a/tests/test_cli/test_add_tag.py +++ b/tests/test_cli/test_add_tag.py @@ -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 diff --git a/tests/test_cli/test_add_tag_inheritance.py b/tests/test_cli/test_add_tag_inheritance.py index 892be393..d3054567 100644 --- a/tests/test_cli/test_add_tag_inheritance.py +++ b/tests/test_cli/test_add_tag_inheritance.py @@ -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 diff --git a/tests/test_cli/test_add_target.py b/tests/test_cli/test_add_target.py index 78aa9249..057320b7 100644 --- a/tests/test_cli/test_add_target.py +++ b/tests/test_cli/test_add_target.py @@ -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 diff --git a/tests/test_cli/test_add_user.py b/tests/test_cli/test_add_user.py index afea994f..fe92c1e5 100644 --- a/tests/test_cli/test_add_user.py +++ b/tests/test_cli/test_add_user.py @@ -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 diff --git a/tests/test_cli/test_add_volume.py b/tests/test_cli/test_add_volume.py index ca4f7406..cab564a8 100644 --- a/tests/test_cli/test_add_volume.py +++ b/tests/test_cli/test_add_volume.py @@ -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 diff --git a/tests/test_cli/test_assign_task.py b/tests/test_cli/test_assign_task.py index ed9f62c3..d2ce3933 100644 --- a/tests/test_cli/test_assign_task.py +++ b/tests/test_cli/test_assign_task.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_block_group.py b/tests/test_cli/test_block_group.py index f483108c..2b5f499b 100644 --- a/tests/test_cli/test_block_group.py +++ b/tests/test_cli/test_block_group.py @@ -1,6 +1,9 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import koji diff --git a/tests/test_cli/test_block_group_pkg.py b/tests/test_cli/test_block_group_pkg.py index 52d6d60e..3ac65b25 100644 --- a/tests/test_cli/test_block_group_pkg.py +++ b/tests/test_cli/test_block_group_pkg.py @@ -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 diff --git a/tests/test_cli/test_block_group_req.py b/tests/test_cli/test_block_group_req.py index 47a79fb1..2d312ef9 100644 --- a/tests/test_cli/test_block_group_req.py +++ b/tests/test_cli/test_block_group_req.py @@ -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 diff --git a/tests/test_cli/test_block_notification.py b/tests/test_cli/test_block_notification.py index 25c1ca46..8d466d34 100644 --- a/tests/test_cli/test_block_notification.py +++ b/tests/test_cli/test_block_notification.py @@ -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 diff --git a/tests/test_cli/test_block_pkg.py b/tests/test_cli/test_block_pkg.py index 750b8237..4d807b5e 100644 --- a/tests/test_cli/test_block_pkg.py +++ b/tests/test_cli/test_block_pkg.py @@ -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 diff --git a/tests/test_cli/test_build.py b/tests/test_cli/test_build.py index e16d8527..11b6fceb 100644 --- a/tests/test_cli/test_build.py +++ b/tests/test_cli/test_build.py @@ -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 diff --git a/tests/test_cli/test_buildinfo.py b/tests/test_cli/test_buildinfo.py index c0180f60..f26dbaed 100644 --- a/tests/test_cli/test_buildinfo.py +++ b/tests/test_cli/test_buildinfo.py @@ -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 diff --git a/tests/test_cli/test_call.py b/tests/test_cli/test_call.py index 378849be..18297e7a 100644 --- a/tests/test_cli/test_call.py +++ b/tests/test_cli/test_call.py @@ -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 diff --git a/tests/test_cli/test_cancel.py b/tests/test_cli/test_cancel.py index 580165c5..7c90f519 100644 --- a/tests/test_cli/test_cancel.py +++ b/tests/test_cli/test_cancel.py @@ -1,6 +1,9 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import koji import six diff --git a/tests/test_cli/test_chain_build.py b/tests/test_cli/test_chain_build.py index f5dd01b5..e881f59f 100644 --- a/tests/test_cli/test_chain_build.py +++ b/tests/test_cli/test_chain_build.py @@ -1,6 +1,9 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_clone_tag.py b/tests/test_cli/test_clone_tag.py index fec6ee61..f4edcf48 100644 --- a/tests/test_cli/test_clone_tag.py +++ b/tests/test_cli/test_clone_tag.py @@ -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 diff --git a/tests/test_cli/test_disable_channel.py b/tests/test_cli/test_disable_channel.py index 03b3d961..d1f25581 100644 --- a/tests/test_cli/test_disable_channel.py +++ b/tests/test_cli/test_disable_channel.py @@ -2,7 +2,10 @@ from __future__ import absolute_import import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import six import koji diff --git a/tests/test_cli/test_disable_host.py b/tests/test_cli/test_disable_host.py index a101c29c..5f4a96f6 100644 --- a/tests/test_cli/test_disable_host.py +++ b/tests/test_cli/test_disable_host.py @@ -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 diff --git a/tests/test_cli/test_disable_user.py b/tests/test_cli/test_disable_user.py index 7e21d22a..d75dd2b7 100644 --- a/tests/test_cli/test_disable_user.py +++ b/tests/test_cli/test_disable_user.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_dist_repo.py b/tests/test_cli/test_dist_repo.py index 591b9b7a..e62e3881 100644 --- a/tests/test_cli/test_dist_repo.py +++ b/tests/test_cli/test_dist_repo.py @@ -4,7 +4,10 @@ from __future__ import print_function 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 diff --git a/tests/test_cli/test_download_build.py b/tests/test_cli/test_download_build.py index cde34083..e8fb19df 100644 --- a/tests/test_cli/test_download_build.py +++ b/tests/test_cli/test_download_build.py @@ -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 diff --git a/tests/test_cli/test_download_file.py b/tests/test_cli/test_download_file.py index 05fe08f7..955adfe0 100644 --- a/tests/test_cli/test_download_file.py +++ b/tests/test_cli/test_download_file.py @@ -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 diff --git a/tests/test_cli/test_download_logs.py b/tests/test_cli/test_download_logs.py index ca7bb647..8e562ecb 100644 --- a/tests/test_cli/test_download_logs.py +++ b/tests/test_cli/test_download_logs.py @@ -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 diff --git a/tests/test_cli/test_download_task.py b/tests/test_cli/test_download_task.py index 6fb54ec7..112576c7 100644 --- a/tests/test_cli/test_download_task.py +++ b/tests/test_cli/test_download_task.py @@ -2,10 +2,14 @@ from __future__ import absolute_import 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 diff --git a/tests/test_cli/test_edit_channel.py b/tests/test_cli/test_edit_channel.py index f4c5f05c..28ffa70a 100644 --- a/tests/test_cli/test_edit_channel.py +++ b/tests/test_cli/test_edit_channel.py @@ -3,7 +3,10 @@ from __future__ import absolute_import import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import koji from koji_cli.commands import handle_edit_channel diff --git a/tests/test_cli/test_edit_external_repo.py b/tests/test_cli/test_edit_external_repo.py index 8cd2210b..6ba56f7d 100644 --- a/tests/test_cli/test_edit_external_repo.py +++ b/tests/test_cli/test_edit_external_repo.py @@ -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 diff --git a/tests/test_cli/test_edit_host.py b/tests/test_cli/test_edit_host.py index 7f6cf681..140d146d 100644 --- a/tests/test_cli/test_edit_host.py +++ b/tests/test_cli/test_edit_host.py @@ -1,11 +1,15 @@ 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 + import koji - -from mock import call - from koji_cli.commands import handle_edit_host from . import utils diff --git a/tests/test_cli/test_edit_notification.py b/tests/test_cli/test_edit_notification.py index 09954dc6..5801bb81 100644 --- a/tests/test_cli/test_edit_notification.py +++ b/tests/test_cli/test_edit_notification.py @@ -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 diff --git a/tests/test_cli/test_edit_permission.py b/tests/test_cli/test_edit_permission.py index c03462f1..5a1c106b 100644 --- a/tests/test_cli/test_edit_permission.py +++ b/tests/test_cli/test_edit_permission.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import koji import six diff --git a/tests/test_cli/test_edit_tag.py b/tests/test_cli/test_edit_tag.py index ae6661f5..dfd0a97b 100644 --- a/tests/test_cli/test_edit_tag.py +++ b/tests/test_cli/test_edit_tag.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import koji diff --git a/tests/test_cli/test_edit_tag_inheritance.py b/tests/test_cli/test_edit_tag_inheritance.py index 87eec6ef..980513a5 100644 --- a/tests/test_cli/test_edit_tag_inheritance.py +++ b/tests/test_cli/test_edit_tag_inheritance.py @@ -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 diff --git a/tests/test_cli/test_edit_target.py b/tests/test_cli/test_edit_target.py index 57a6c53a..937e96d9 100644 --- a/tests/test_cli/test_edit_target.py +++ b/tests/test_cli/test_edit_target.py @@ -2,7 +2,10 @@ from __future__ import absolute_import import copy -import mock +try: + from unittest import mock +except ImportError: + import mock from six.moves import StringIO import koji diff --git a/tests/test_cli/test_edit_user.py b/tests/test_cli/test_edit_user.py index 1bc31ed2..afdb6cf6 100644 --- a/tests/test_cli/test_edit_user.py +++ b/tests/test_cli/test_edit_user.py @@ -3,7 +3,10 @@ from __future__ import absolute_import import unittest import six -import mock +try: + from unittest import mock +except ImportError: + import mock import koji diff --git a/tests/test_cli/test_enable_channel.py b/tests/test_cli/test_enable_channel.py index f1243e15..687601cd 100644 --- a/tests/test_cli/test_enable_channel.py +++ b/tests/test_cli/test_enable_channel.py @@ -2,7 +2,10 @@ from __future__ import absolute_import import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import six import koji diff --git a/tests/test_cli/test_enable_host.py b/tests/test_cli/test_enable_host.py index bb9721e3..b81925df 100644 --- a/tests/test_cli/test_enable_host.py +++ b/tests/test_cli/test_enable_host.py @@ -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 diff --git a/tests/test_cli/test_enable_user.py b/tests/test_cli/test_enable_user.py index 9438ef08..2c803edf 100644 --- a/tests/test_cli/test_enable_user.py +++ b/tests/test_cli/test_enable_user.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import unittest import koji diff --git a/tests/test_cli/test_free_task.py b/tests/test_cli/test_free_task.py index 5e1f40f2..e62775e2 100644 --- a/tests/test_cli/test_free_task.py +++ b/tests/test_cli/test_free_task.py @@ -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 diff --git a/tests/test_cli/test_get_options.py b/tests/test_cli/test_get_options.py index 5a0dd527..3caed38c 100644 --- a/tests/test_cli/test_get_options.py +++ b/tests/test_cli/test_get_options.py @@ -1,6 +1,9 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import optparse import koji diff --git a/tests/test_cli/test_grant_cg_access.py b/tests/test_cli/test_grant_cg_access.py index d2ba71bc..c2c2aae8 100644 --- a/tests/test_cli/test_grant_cg_access.py +++ b/tests/test_cli/test_grant_cg_access.py @@ -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 diff --git a/tests/test_cli/test_grant_permission.py b/tests/test_cli/test_grant_permission.py index f5df6ef4..ba6f778d 100644 --- a/tests/test_cli/test_grant_permission.py +++ b/tests/test_cli/test_grant_permission.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import unittest import koji diff --git a/tests/test_cli/test_hello.py b/tests/test_cli/test_hello.py index 079e68cb..d1f0bec4 100644 --- a/tests/test_cli/test_hello.py +++ b/tests/test_cli/test_hello.py @@ -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 diff --git a/tests/test_cli/test_hostinfo.py b/tests/test_cli/test_hostinfo.py index 87bf57c7..4cb3a691 100644 --- a/tests/test_cli/test_hostinfo.py +++ b/tests/test_cli/test_hostinfo.py @@ -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 diff --git a/tests/test_cli/test_image_build.py b/tests/test_cli/test_image_build.py index ea44c27f..728c0ce9 100644 --- a/tests/test_cli/test_image_build.py +++ b/tests/test_cli/test_image_build.py @@ -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 diff --git a/tests/test_cli/test_image_build_indirection.py b/tests/test_cli/test_image_build_indirection.py index fd556bb5..9e674fb4 100644 --- a/tests/test_cli/test_image_build_indirection.py +++ b/tests/test_cli/test_image_build_indirection.py @@ -3,7 +3,10 @@ from __future__ import absolute_import import os import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import six import koji diff --git a/tests/test_cli/test_import.py b/tests/test_cli/test_import.py index 381efad8..7a916c46 100644 --- a/tests/test_cli/test_import.py +++ b/tests/test_cli/test_import.py @@ -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 diff --git a/tests/test_cli/test_import_archive.py b/tests/test_cli/test_import_archive.py index b6f07061..4d2603f9 100644 --- a/tests/test_cli/test_import_archive.py +++ b/tests/test_cli/test_import_archive.py @@ -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 diff --git a/tests/test_cli/test_import_cg.py b/tests/test_cli/test_import_cg.py index 852945a3..d384dcb6 100644 --- a/tests/test_cli/test_import_cg.py +++ b/tests/test_cli/test_import_cg.py @@ -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): diff --git a/tests/test_cli/test_import_comps.py b/tests/test_cli/test_import_comps.py index de2f82f5..62daebd6 100644 --- a/tests/test_cli/test_import_comps.py +++ b/tests/test_cli/test_import_comps.py @@ -7,7 +7,10 @@ import json import pytest import koji -import mock +try: + from unittest import mock +except ImportError: + import mock import six try: diff --git a/tests/test_cli/test_import_sig.py b/tests/test_cli/test_import_sig.py index 2f1519ac..00bdb4af 100644 --- a/tests/test_cli/test_import_sig.py +++ b/tests/test_cli/test_import_sig.py @@ -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 diff --git a/tests/test_cli/test_latest_build.py b/tests/test_cli/test_latest_build.py index 0cef965f..d572e8c4 100644 --- a/tests/test_cli/test_latest_build.py +++ b/tests/test_cli/test_latest_build.py @@ -2,7 +2,10 @@ from __future__ import absolute_import 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 diff --git a/tests/test_cli/test_list_api.py b/tests/test_cli/test_list_api.py index 3d007cab..afd560fd 100644 --- a/tests/test_cli/test_list_api.py +++ b/tests/test_cli/test_list_api.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_list_buildroot.py b/tests/test_cli/test_list_buildroot.py index 89e7b613..99f1b21f 100644 --- a/tests/test_cli/test_list_buildroot.py +++ b/tests/test_cli/test_list_buildroot.py @@ -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 diff --git a/tests/test_cli/test_list_builds.py b/tests/test_cli/test_list_builds.py index 4f0875a7..db0bfb7d 100644 --- a/tests/test_cli/test_list_builds.py +++ b/tests/test_cli/test_list_builds.py @@ -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 diff --git a/tests/test_cli/test_list_channels.py b/tests/test_cli/test_list_channels.py index 747ebed3..30c7e6f6 100644 --- a/tests/test_cli/test_list_channels.py +++ b/tests/test_cli/test_list_channels.py @@ -2,7 +2,10 @@ from __future__ import absolute_import import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock from six.moves import StringIO import koji diff --git a/tests/test_cli/test_list_commands.py b/tests/test_cli/test_list_commands.py index 63c134bf..81d2c92d 100644 --- a/tests/test_cli/test_list_commands.py +++ b/tests/test_cli/test_list_commands.py @@ -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 diff --git a/tests/test_cli/test_list_external_repos.py b/tests/test_cli/test_list_external_repos.py index 1bdf6706..eef00216 100644 --- a/tests/test_cli/test_list_external_repos.py +++ b/tests/test_cli/test_list_external_repos.py @@ -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 diff --git a/tests/test_cli/test_list_groups.py b/tests/test_cli/test_list_groups.py index 441d7462..b06e8522 100644 --- a/tests/test_cli/test_list_groups.py +++ b/tests/test_cli/test_list_groups.py @@ -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 diff --git a/tests/test_cli/test_list_history.py b/tests/test_cli/test_list_history.py index c3286dcd..89c52dba 100644 --- a/tests/test_cli/test_list_history.py +++ b/tests/test_cli/test_list_history.py @@ -7,7 +7,10 @@ from dateutil.tz import tzutc 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 diff --git a/tests/test_cli/test_list_hosts.py b/tests/test_cli/test_list_hosts.py index 698653a5..a5a20711 100644 --- a/tests/test_cli/test_list_hosts.py +++ b/tests/test_cli/test_list_hosts.py @@ -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 diff --git a/tests/test_cli/test_list_notifications.py b/tests/test_cli/test_list_notifications.py index ef8f643f..9754193e 100644 --- a/tests/test_cli/test_list_notifications.py +++ b/tests/test_cli/test_list_notifications.py @@ -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 diff --git a/tests/test_cli/test_list_permissions.py b/tests/test_cli/test_list_permissions.py index 9fb51578..437227c6 100644 --- a/tests/test_cli/test_list_permissions.py +++ b/tests/test_cli/test_list_permissions.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_list_pkgs.py b/tests/test_cli/test_list_pkgs.py index 5c7c28ff..f85634fb 100644 --- a/tests/test_cli/test_list_pkgs.py +++ b/tests/test_cli/test_list_pkgs.py @@ -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 diff --git a/tests/test_cli/test_list_signed.py b/tests/test_cli/test_list_signed.py index 9be5e43a..bbf437d1 100644 --- a/tests/test_cli/test_list_signed.py +++ b/tests/test_cli/test_list_signed.py @@ -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 diff --git a/tests/test_cli/test_list_tag_inheritance.py b/tests/test_cli/test_list_tag_inheritance.py index 1e1aec51..e574ae2a 100644 --- a/tests/test_cli/test_list_tag_inheritance.py +++ b/tests/test_cli/test_list_tag_inheritance.py @@ -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 diff --git a/tests/test_cli/test_list_tagged.py b/tests/test_cli/test_list_tagged.py index f91ae4e2..52f179a4 100644 --- a/tests/test_cli/test_list_tagged.py +++ b/tests/test_cli/test_list_tagged.py @@ -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 diff --git a/tests/test_cli/test_list_tags.py b/tests/test_cli/test_list_tags.py index aa8f59c2..bd2d408e 100644 --- a/tests/test_cli/test_list_tags.py +++ b/tests/test_cli/test_list_tags.py @@ -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 diff --git a/tests/test_cli/test_list_targets.py b/tests/test_cli/test_list_targets.py index 461d9d6c..f7be7d53 100644 --- a/tests/test_cli/test_list_targets.py +++ b/tests/test_cli/test_list_targets.py @@ -4,7 +4,10 @@ import time 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 diff --git a/tests/test_cli/test_list_tasks.py b/tests/test_cli/test_list_tasks.py index ddf67dda..dc02b5b6 100644 --- a/tests/test_cli/test_list_tasks.py +++ b/tests/test_cli/test_list_tasks.py @@ -2,7 +2,10 @@ from __future__ import absolute_import import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import six import koji diff --git a/tests/test_cli/test_list_untagged.py b/tests/test_cli/test_list_untagged.py index bf251c3e..1eabb5c4 100644 --- a/tests/test_cli/test_list_untagged.py +++ b/tests/test_cli/test_list_untagged.py @@ -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 diff --git a/tests/test_cli/test_list_users.py b/tests/test_cli/test_list_users.py index dc7eff23..ead0efe6 100644 --- a/tests/test_cli/test_list_users.py +++ b/tests/test_cli/test_list_users.py @@ -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 diff --git a/tests/test_cli/test_list_volumes.py b/tests/test_cli/test_list_volumes.py index 890eba27..97ea3b63 100644 --- a/tests/test_cli/test_list_volumes.py +++ b/tests/test_cli/test_list_volumes.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_load_plugins.py b/tests/test_cli/test_load_plugins.py index c9aa6a35..1cbc2b2c 100644 --- a/tests/test_cli/test_load_plugins.py +++ b/tests/test_cli/test_load_plugins.py @@ -4,7 +4,10 @@ import os import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock from . import loadcli diff --git a/tests/test_cli/test_lock_tag.py b/tests/test_cli/test_lock_tag.py index eda072fb..996ab4fc 100644 --- a/tests/test_cli/test_lock_tag.py +++ b/tests/test_cli/test_lock_tag.py @@ -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 diff --git a/tests/test_cli/test_make_task.py b/tests/test_cli/test_make_task.py index c4c8c64e..981f0433 100644 --- a/tests/test_cli/test_make_task.py +++ b/tests/test_cli/test_make_task.py @@ -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 diff --git a/tests/test_cli/test_maven_build.py b/tests/test_cli/test_maven_build.py index 0e54ebb0..abdb7f90 100644 --- a/tests/test_cli/test_maven_build.py +++ b/tests/test_cli/test_maven_build.py @@ -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 diff --git a/tests/test_cli/test_maven_chain.py b/tests/test_cli/test_maven_chain.py index 18f4e3a0..0e3a57ac 100644 --- a/tests/test_cli/test_maven_chain.py +++ b/tests/test_cli/test_maven_chain.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_mock_config.py b/tests/test_cli/test_mock_config.py index c054cab5..95faef26 100644 --- a/tests/test_cli/test_mock_config.py +++ b/tests/test_cli/test_mock_config.py @@ -2,7 +2,10 @@ from __future__ import absolute_import import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import six import koji diff --git a/tests/test_cli/test_move_build.py b/tests/test_cli/test_move_build.py index c836edb9..1e58dcce 100644 --- a/tests/test_cli/test_move_build.py +++ b/tests/test_cli/test_move_build.py @@ -2,7 +2,10 @@ from __future__ import absolute_import import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import six from koji_cli.commands import handle_move_build diff --git a/tests/test_cli/test_promote_build.py b/tests/test_cli/test_promote_build.py index 49530aa8..9a51d64d 100644 --- a/tests/test_cli/test_promote_build.py +++ b/tests/test_cli/test_promote_build.py @@ -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 diff --git a/tests/test_cli/test_prune_signed_copies.py b/tests/test_cli/test_prune_signed_copies.py index f568ad34..1bbd5fa4 100644 --- a/tests/test_cli/test_prune_signed_copies.py +++ b/tests/test_cli/test_prune_signed_copies.py @@ -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 diff --git a/tests/test_cli/test_regen_repo.py b/tests/test_cli/test_regen_repo.py index 8fb2f918..9091b6f5 100644 --- a/tests/test_cli/test_regen_repo.py +++ b/tests/test_cli/test_regen_repo.py @@ -4,7 +4,10 @@ from __future__ import print_function 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 diff --git a/tests/test_cli/test_remove_external_repo.py b/tests/test_cli/test_remove_external_repo.py index 268b07e1..337f592d 100644 --- a/tests/test_cli/test_remove_external_repo.py +++ b/tests/test_cli/test_remove_external_repo.py @@ -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 diff --git a/tests/test_cli/test_remove_group.py b/tests/test_cli/test_remove_group.py index c3cacc31..a6b058f7 100644 --- a/tests/test_cli/test_remove_group.py +++ b/tests/test_cli/test_remove_group.py @@ -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 diff --git a/tests/test_cli/test_remove_host_from_channel.py b/tests/test_cli/test_remove_host_from_channel.py index 76bc8dcc..3a73a5d9 100644 --- a/tests/test_cli/test_remove_host_from_channel.py +++ b/tests/test_cli/test_remove_host_from_channel.py @@ -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 diff --git a/tests/test_cli/test_remove_notification.py b/tests/test_cli/test_remove_notification.py index bccfb339..5578a586 100644 --- a/tests/test_cli/test_remove_notification.py +++ b/tests/test_cli/test_remove_notification.py @@ -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 diff --git a/tests/test_cli/test_remove_pkg.py b/tests/test_cli/test_remove_pkg.py index 8d28c6b8..e060e1fc 100644 --- a/tests/test_cli/test_remove_pkg.py +++ b/tests/test_cli/test_remove_pkg.py @@ -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 diff --git a/tests/test_cli/test_remove_sig.py b/tests/test_cli/test_remove_sig.py index 45dd7f8b..97e1b8c3 100644 --- a/tests/test_cli/test_remove_sig.py +++ b/tests/test_cli/test_remove_sig.py @@ -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 diff --git a/tests/test_cli/test_remove_tag.py b/tests/test_cli/test_remove_tag.py index 67441d66..14a5558f 100644 --- a/tests/test_cli/test_remove_tag.py +++ b/tests/test_cli/test_remove_tag.py @@ -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 diff --git a/tests/test_cli/test_remove_tag_inheritance.py b/tests/test_cli/test_remove_tag_inheritance.py index a0c261d1..9514cbe7 100644 --- a/tests/test_cli/test_remove_tag_inheritance.py +++ b/tests/test_cli/test_remove_tag_inheritance.py @@ -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 diff --git a/tests/test_cli/test_remove_target.py b/tests/test_cli/test_remove_target.py index 45b0e0e0..bdcc5fd9 100644 --- a/tests/test_cli/test_remove_target.py +++ b/tests/test_cli/test_remove_target.py @@ -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 diff --git a/tests/test_cli/test_repoinfo.py b/tests/test_cli/test_repoinfo.py index e175c5db..970c65f7 100644 --- a/tests/test_cli/test_repoinfo.py +++ b/tests/test_cli/test_repoinfo.py @@ -2,7 +2,10 @@ from __future__ import absolute_import import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import shutil import six import tempfile diff --git a/tests/test_cli/test_restart_host.py b/tests/test_cli/test_restart_host.py index 4d81b29c..8078363e 100644 --- a/tests/test_cli/test_restart_host.py +++ b/tests/test_cli/test_restart_host.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_resubmit.py b/tests/test_cli/test_resubmit.py index 75a6222c..3d9219d4 100644 --- a/tests/test_cli/test_resubmit.py +++ b/tests/test_cli/test_resubmit.py @@ -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 diff --git a/tests/test_cli/test_revoke_cg_access.py b/tests/test_cli/test_revoke_cg_access.py index 8b3107c4..ad5ba696 100644 --- a/tests/test_cli/test_revoke_cg_access.py +++ b/tests/test_cli/test_revoke_cg_access.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_revoke_permission.py b/tests/test_cli/test_revoke_permission.py index e532df0b..afd4bf97 100644 --- a/tests/test_cli/test_revoke_permission.py +++ b/tests/test_cli/test_revoke_permission.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_rpminfo.py b/tests/test_cli/test_rpminfo.py index e4784f41..8f8257d4 100644 --- a/tests/test_cli/test_rpminfo.py +++ b/tests/test_cli/test_rpminfo.py @@ -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 diff --git a/tests/test_cli/test_running_in_bg.py b/tests/test_cli/test_running_in_bg.py index 9829782f..68ac23b6 100644 --- a/tests/test_cli/test_running_in_bg.py +++ b/tests/test_cli/test_running_in_bg.py @@ -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 diff --git a/tests/test_cli/test_search.py b/tests/test_cli/test_search.py index 2996c2a9..946500ad 100644 --- a/tests/test_cli/test_search.py +++ b/tests/test_cli/test_search.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_set_build_volume.py b/tests/test_cli/test_set_build_volume.py index 33302f16..994da1c6 100644 --- a/tests/test_cli/test_set_build_volume.py +++ b/tests/test_cli/test_set_build_volume.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_set_pkg_arches.py b/tests/test_cli/test_set_pkg_arches.py index fd4ecafb..3d002089 100644 --- a/tests/test_cli/test_set_pkg_arches.py +++ b/tests/test_cli/test_set_pkg_arches.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_set_pkg_owner.py b/tests/test_cli/test_set_pkg_owner.py index 03bef5e0..a65d436e 100644 --- a/tests/test_cli/test_set_pkg_owner.py +++ b/tests/test_cli/test_set_pkg_owner.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_set_pkg_owner_global.py b/tests/test_cli/test_set_pkg_owner_global.py index 29333880..ebc23df7 100644 --- a/tests/test_cli/test_set_pkg_owner_global.py +++ b/tests/test_cli/test_set_pkg_owner_global.py @@ -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 diff --git a/tests/test_cli/test_set_task_priority.py b/tests/test_cli/test_set_task_priority.py index dda93d39..7296bd8d 100644 --- a/tests/test_cli/test_set_task_priority.py +++ b/tests/test_cli/test_set_task_priority.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_show_groups.py b/tests/test_cli/test_show_groups.py index 15ef148a..c419d20c 100644 --- a/tests/test_cli/test_show_groups.py +++ b/tests/test_cli/test_show_groups.py @@ -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 diff --git a/tests/test_cli/test_spin_commands.py b/tests/test_cli/test_spin_commands.py index 9de23e25..ba8bc139 100644 --- a/tests/test_cli/test_spin_commands.py +++ b/tests/test_cli/test_spin_commands.py @@ -3,7 +3,10 @@ from __future__ import absolute_import 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, \ diff --git a/tests/test_cli/test_tag_build.py b/tests/test_cli/test_tag_build.py index f7efef04..e7b042ed 100644 --- a/tests/test_cli/test_tag_build.py +++ b/tests/test_cli/test_tag_build.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_taginfo.py b/tests/test_cli/test_taginfo.py index aa1ec3eb..1d26dcc6 100644 --- a/tests/test_cli/test_taginfo.py +++ b/tests/test_cli/test_taginfo.py @@ -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 diff --git a/tests/test_cli/test_taskinfo.py b/tests/test_cli/test_taskinfo.py index 9796bd8f..688bf830 100644 --- a/tests/test_cli/test_taskinfo.py +++ b/tests/test_cli/test_taskinfo.py @@ -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 diff --git a/tests/test_cli/test_unblock_group_pkg.py b/tests/test_cli/test_unblock_group_pkg.py index 7ae184e9..8ca27bf3 100644 --- a/tests/test_cli/test_unblock_group_pkg.py +++ b/tests/test_cli/test_unblock_group_pkg.py @@ -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 diff --git a/tests/test_cli/test_unblock_group_req.py b/tests/test_cli/test_unblock_group_req.py index 5b20a2df..e5d44dff 100644 --- a/tests/test_cli/test_unblock_group_req.py +++ b/tests/test_cli/test_unblock_group_req.py @@ -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 diff --git a/tests/test_cli/test_unblock_notification.py b/tests/test_cli/test_unblock_notification.py index fd2c80b1..61c98590 100644 --- a/tests/test_cli/test_unblock_notification.py +++ b/tests/test_cli/test_unblock_notification.py @@ -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 diff --git a/tests/test_cli/test_unblock_pkg.py b/tests/test_cli/test_unblock_pkg.py index 1fb25d14..4231a515 100644 --- a/tests/test_cli/test_unblock_pkg.py +++ b/tests/test_cli/test_unblock_pkg.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_unlock_tag.py b/tests/test_cli/test_unlock_tag.py index 7252c881..41c6e7dc 100644 --- a/tests/test_cli/test_unlock_tag.py +++ b/tests/test_cli/test_unlock_tag.py @@ -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 diff --git a/tests/test_cli/test_untag_build.py b/tests/test_cli/test_untag_build.py index 5d2d6caf..bc174435 100644 --- a/tests/test_cli/test_untag_build.py +++ b/tests/test_cli/test_untag_build.py @@ -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 diff --git a/tests/test_cli/test_upload_progress_callback.py b/tests/test_cli/test_upload_progress_callback.py index c291998c..7fe220e3 100644 --- a/tests/test_cli/test_upload_progress_callback.py +++ b/tests/test_cli/test_upload_progress_callback.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_userinfo.py b/tests/test_cli/test_userinfo.py index ec524fdd..33415973 100644 --- a/tests/test_cli/test_userinfo.py +++ b/tests/test_cli/test_userinfo.py @@ -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 diff --git a/tests/test_cli/test_version.py b/tests/test_cli/test_version.py index 9a3ce952..a6c0775f 100644 --- a/tests/test_cli/test_version.py +++ b/tests/test_cli/test_version.py @@ -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 diff --git a/tests/test_cli/test_wait_repo.py b/tests/test_cli/test_wait_repo.py index 2d301f6b..2f2714ec 100644 --- a/tests/test_cli/test_wait_repo.py +++ b/tests/test_cli/test_wait_repo.py @@ -5,7 +5,10 @@ from __future__ import print_function import unittest import copy -import mock +try: + from unittest import mock +except ImportError: + import mock import pytest import six diff --git a/tests/test_cli/test_watch_logs.py b/tests/test_cli/test_watch_logs.py index 24630677..34c782b1 100644 --- a/tests/test_cli/test_watch_logs.py +++ b/tests/test_cli/test_watch_logs.py @@ -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 diff --git a/tests/test_cli/test_watch_tasks.py b/tests/test_cli/test_watch_tasks.py index 9f09cc18..1971edb5 100644 --- a/tests/test_cli/test_watch_tasks.py +++ b/tests/test_cli/test_watch_tasks.py @@ -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 diff --git a/tests/test_cli/test_win_build.py b/tests/test_cli/test_win_build.py index bac4a674..cb252e6f 100644 --- a/tests/test_cli/test_win_build.py +++ b/tests/test_cli/test_win_build.py @@ -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 diff --git a/tests/test_cli/test_wrapper_rpm.py b/tests/test_cli/test_wrapper_rpm.py index 507b5d4a..44c9f73a 100644 --- a/tests/test_cli/test_wrapper_rpm.py +++ b/tests/test_cli/test_wrapper_rpm.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_cli/test_write_signed_rpm.py b/tests/test_cli/test_write_signed_rpm.py index 6d1edee8..d12128f5 100644 --- a/tests/test_cli/test_write_signed_rpm.py +++ b/tests/test_cli/test_write_signed_rpm.py @@ -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 diff --git a/tests/test_cli/utils.py b/tests/test_cli/utils.py index 3ac2b51d..3cf113f2 100644 --- a/tests/test_cli/utils.py +++ b/tests/test_cli/utils.py @@ -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 diff --git a/tests/test_hub/test_add_archivetype.py b/tests/test_hub/test_add_archivetype.py index 68a04405..7cc1d185 100644 --- a/tests/test_hub/test_add_archivetype.py +++ b/tests/test_hub/test_add_archivetype.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_add_btype.py b/tests/test_hub/test_add_btype.py index 04a473f9..2291387b 100644 --- a/tests/test_hub/test_add_btype.py +++ b/tests/test_hub/test_add_btype.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_add_channel.py b/tests/test_hub/test_add_channel.py index 4fe0f66b..804ab31c 100644 --- a/tests/test_hub/test_add_channel.py +++ b/tests/test_hub/test_add_channel.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_add_external_repo_to_tag.py b/tests/test_hub/test_add_external_repo_to_tag.py index cf872a4b..20afd91d 100644 --- a/tests/test_hub/test_add_external_repo_to_tag.py +++ b/tests/test_hub/test_add_external_repo_to_tag.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_add_external_rpm.py b/tests/test_hub/test_add_external_rpm.py index 50a67647..d47683f5 100644 --- a/tests/test_hub/test_add_external_rpm.py +++ b/tests/test_hub/test_add_external_rpm.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_add_group_member.py b/tests/test_hub/test_add_group_member.py index e63b55f8..1f522287 100644 --- a/tests/test_hub/test_add_group_member.py +++ b/tests/test_hub/test_add_group_member.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_add_host.py b/tests/test_hub/test_add_host.py index 55b92389..5340ca9a 100644 --- a/tests/test_hub/test_add_host.py +++ b/tests/test_hub/test_add_host.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_add_host_to_channel.py b/tests/test_hub/test_add_host_to_channel.py index 8bb569c4..6e7da408 100644 --- a/tests/test_hub/test_add_host_to_channel.py +++ b/tests/test_hub/test_add_host_to_channel.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_add_rpm_sig.py b/tests/test_hub/test_add_rpm_sig.py index 7513ac9a..e420cc5c 100644 --- a/tests/test_hub/test_add_rpm_sig.py +++ b/tests/test_hub/test_add_rpm_sig.py @@ -1,5 +1,5 @@ import base64 -import mock +from unittest import mock import os import unittest diff --git a/tests/test_hub/test_add_user_krb_principal.py b/tests/test_hub/test_add_user_krb_principal.py index ad13fdd4..d6b84212 100644 --- a/tests/test_hub/test_add_user_krb_principal.py +++ b/tests/test_hub/test_add_user_krb_principal.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_add_volume.py b/tests/test_hub/test_add_volume.py index d92b08a9..ce8e09e3 100644 --- a/tests/test_hub/test_add_volume.py +++ b/tests/test_hub/test_add_volume.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_auto_arch_refuse.py b/tests/test_hub/test_auto_arch_refuse.py index 674e393e..e92ea833 100644 --- a/tests/test_hub/test_auto_arch_refuse.py +++ b/tests/test_hub/test_auto_arch_refuse.py @@ -1,5 +1,5 @@ import datetime -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_build.py b/tests/test_hub/test_build.py index 0db9d2d2..d127f6f2 100644 --- a/tests/test_hub/test_build.py +++ b/tests/test_hub/test_build.py @@ -1,7 +1,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock class TestBuild(unittest.TestCase): diff --git a/tests/test_hub/test_build_image.py b/tests/test_hub/test_build_image.py index 22ccad0b..c49b0d42 100644 --- a/tests/test_hub/test_build_image.py +++ b/tests/test_hub/test_build_image.py @@ -1,7 +1,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock class TestBuildImage(unittest.TestCase): diff --git a/tests/test_hub/test_build_image_indirection.py b/tests/test_hub/test_build_image_indirection.py index 12212b1d..55557bd6 100644 --- a/tests/test_hub/test_build_image_indirection.py +++ b/tests/test_hub/test_build_image_indirection.py @@ -1,7 +1,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock class TestBuildImageIndirection(unittest.TestCase): diff --git a/tests/test_hub/test_build_image_oz.py b/tests/test_hub/test_build_image_oz.py index 49a29dca..9bfed898 100644 --- a/tests/test_hub/test_build_image_oz.py +++ b/tests/test_hub/test_build_image_oz.py @@ -1,7 +1,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock class TestBuildImageOz(unittest.TestCase): diff --git a/tests/test_hub/test_build_notification.py b/tests/test_hub/test_build_notification.py index a7d6cfb5..33b7aab4 100644 --- a/tests/test_hub/test_build_notification.py +++ b/tests/test_hub/test_build_notification.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import unittest diff --git a/tests/test_hub/test_bulkupdate_processor.py b/tests/test_hub/test_bulkupdate_processor.py index 25809d9d..f0201279 100644 --- a/tests/test_hub/test_bulkupdate_processor.py +++ b/tests/test_hub/test_bulkupdate_processor.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest from kojihub import db diff --git a/tests/test_hub/test_cancel_build.py b/tests/test_hub/test_cancel_build.py index 87f108d8..38699616 100644 --- a/tests/test_hub/test_cancel_build.py +++ b/tests/test_hub/test_cancel_build.py @@ -1,7 +1,7 @@ # coding: utf-8 import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_cg_importer.py b/tests/test_hub/test_cg_importer.py index 6da32888..ba2eac36 100644 --- a/tests/test_hub/test_cg_importer.py +++ b/tests/test_hub/test_cg_importer.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import os import shutil import tempfile diff --git a/tests/test_hub/test_chain_build.py b/tests/test_hub/test_chain_build.py index 042e37d4..14704907 100644 --- a/tests/test_hub/test_chain_build.py +++ b/tests/test_hub/test_chain_build.py @@ -1,7 +1,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock class TestChainBuild(unittest.TestCase): diff --git a/tests/test_hub/test_chain_maven.py b/tests/test_hub/test_chain_maven.py index 54f6a06c..b856a690 100644 --- a/tests/test_hub/test_chain_maven.py +++ b/tests/test_hub/test_chain_maven.py @@ -1,7 +1,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock class TestChainMaven(unittest.TestCase): diff --git a/tests/test_hub/test_check_volume_policy.py b/tests/test_hub/test_check_volume_policy.py index 191fa3ba..55c2f2ff 100644 --- a/tests/test_hub/test_check_volume_policy.py +++ b/tests/test_hub/test_check_volume_policy.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import koji.policy diff --git a/tests/test_hub/test_complete_image_build.py b/tests/test_hub/test_complete_image_build.py index ee828e1e..f9d5d561 100644 --- a/tests/test_hub/test_complete_image_build.py +++ b/tests/test_hub/test_complete_image_build.py @@ -1,5 +1,5 @@ import copy -import mock +from unittest import mock import os import os.path import shutil diff --git a/tests/test_hub/test_complete_maven_build.py b/tests/test_hub/test_complete_maven_build.py index 17f4972e..df03a91d 100644 --- a/tests/test_hub/test_complete_maven_build.py +++ b/tests/test_hub/test_complete_maven_build.py @@ -1,5 +1,5 @@ import copy -import mock +from unittest import mock import os import os.path import shutil diff --git a/tests/test_hub/test_create_build_target.py b/tests/test_hub/test_create_build_target.py index 14d8e9ce..74ff67bc 100644 --- a/tests/test_hub/test_create_build_target.py +++ b/tests/test_hub/test_create_build_target.py @@ -1,7 +1,7 @@ # coding: utf-8 import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_create_external_repo.py b/tests/test_hub/test_create_external_repo.py index 53388c75..65bcfff4 100644 --- a/tests/test_hub/test_create_external_repo.py +++ b/tests/test_hub/test_create_external_repo.py @@ -1,7 +1,7 @@ # coding: utf-8 import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_create_image_build.py b/tests/test_hub/test_create_image_build.py index 2db4c647..421e8889 100644 --- a/tests/test_hub/test_create_image_build.py +++ b/tests/test_hub/test_create_image_build.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_create_maven_build.py b/tests/test_hub/test_create_maven_build.py index 53aa9fad..95e82e5b 100644 --- a/tests/test_hub/test_create_maven_build.py +++ b/tests/test_hub/test_create_maven_build.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_create_notification.py b/tests/test_hub/test_create_notification.py index ef444adc..14a05cc3 100644 --- a/tests/test_hub/test_create_notification.py +++ b/tests/test_hub/test_create_notification.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_create_notification_block.py b/tests/test_hub/test_create_notification_block.py index b8948629..d56e76b5 100644 --- a/tests/test_hub/test_create_notification_block.py +++ b/tests/test_hub/test_create_notification_block.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_create_rpm_checksum.py b/tests/test_hub/test_create_rpm_checksum.py index d8200c74..5ecc9099 100644 --- a/tests/test_hub/test_create_rpm_checksum.py +++ b/tests/test_hub/test_create_rpm_checksum.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import kojihub diff --git a/tests/test_hub/test_create_tag.py b/tests/test_hub/test_create_tag.py index 6f0ab604..e182c59e 100644 --- a/tests/test_hub/test_create_tag.py +++ b/tests/test_hub/test_create_tag.py @@ -1,7 +1,7 @@ # coding: utf-8 import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_create_user.py b/tests/test_hub/test_create_user.py index 00cf2212..27ad4893 100644 --- a/tests/test_hub/test_create_user.py +++ b/tests/test_hub/test_create_user.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_create_win_build.py b/tests/test_hub/test_create_win_build.py index 3d2bbefc..7be05ad8 100644 --- a/tests/test_hub/test_create_win_build.py +++ b/tests/test_hub/test_create_win_build.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_delete_build.py b/tests/test_hub/test_delete_build.py index 9fd50ac2..a77fe7a4 100644 --- a/tests/test_hub/test_delete_build.py +++ b/tests/test_hub/test_delete_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import time import unittest from collections import defaultdict diff --git a/tests/test_hub/test_delete_build_target.py b/tests/test_hub/test_delete_build_target.py index 6e8f224a..2c7f27de 100644 --- a/tests/test_hub/test_delete_build_target.py +++ b/tests/test_hub/test_delete_build_target.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_delete_external_repo.py b/tests/test_hub/test_delete_external_repo.py index 2303f5b6..17e96c83 100644 --- a/tests/test_hub/test_delete_external_repo.py +++ b/tests/test_hub/test_delete_external_repo.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import kojihub diff --git a/tests/test_hub/test_delete_notification.py b/tests/test_hub/test_delete_notification.py index d6720edf..1083de2b 100644 --- a/tests/test_hub/test_delete_notification.py +++ b/tests/test_hub/test_delete_notification.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_delete_notification_block.py b/tests/test_hub/test_delete_notification_block.py index bbd0da0f..88ace196 100644 --- a/tests/test_hub/test_delete_notification_block.py +++ b/tests/test_hub/test_delete_notification_block.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_delete_rpm_sig.py b/tests/test_hub/test_delete_rpm_sig.py index 907c0337..bf763009 100644 --- a/tests/test_hub/test_delete_rpm_sig.py +++ b/tests/test_hub/test_delete_rpm_sig.py @@ -3,7 +3,7 @@ import tempfile import shutil import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_delete_tag.py b/tests/test_hub/test_delete_tag.py index 759c1e44..f9445b70 100644 --- a/tests/test_hub/test_delete_tag.py +++ b/tests/test_hub/test_delete_tag.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_disable_channel.py b/tests/test_hub/test_disable_channel.py index c8d900a0..4f7650b7 100644 --- a/tests/test_hub/test_disable_channel.py +++ b/tests/test_hub/test_disable_channel.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_disable_user.py b/tests/test_hub/test_disable_user.py index 94cb3a14..79329669 100644 --- a/tests/test_hub/test_disable_user.py +++ b/tests/test_hub/test_disable_user.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_dist_repo.py b/tests/test_hub/test_dist_repo.py index 471ff142..fa3a4697 100644 --- a/tests/test_hub/test_dist_repo.py +++ b/tests/test_hub/test_dist_repo.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import os import shutil import tempfile diff --git a/tests/test_hub/test_download_task_output.py b/tests/test_hub/test_download_task_output.py index 114686e8..8c25078f 100644 --- a/tests/test_hub/test_download_task_output.py +++ b/tests/test_hub/test_download_task_output.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_edit_build_target.py b/tests/test_hub/test_edit_build_target.py index 526af201..a2d8fada 100644 --- a/tests/test_hub/test_edit_build_target.py +++ b/tests/test_hub/test_edit_build_target.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_edit_channel.py b/tests/test_hub/test_edit_channel.py index c59e4daa..9b603a80 100644 --- a/tests/test_hub/test_edit_channel.py +++ b/tests/test_hub/test_edit_channel.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_edit_external_repo.py b/tests/test_hub/test_edit_external_repo.py index 28fcc037..fb309455 100644 --- a/tests/test_hub/test_edit_external_repo.py +++ b/tests/test_hub/test_edit_external_repo.py @@ -1,7 +1,7 @@ # coding: utf-8 import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_edit_host.py b/tests/test_hub/test_edit_host.py index 75719e4e..144c49e2 100644 --- a/tests/test_hub/test_edit_host.py +++ b/tests/test_hub/test_edit_host.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_edit_permission.py b/tests/test_hub/test_edit_permission.py index 7a349a8d..5b50798a 100644 --- a/tests/test_hub/test_edit_permission.py +++ b/tests/test_hub/test_edit_permission.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_edit_tag.py b/tests/test_hub/test_edit_tag.py index d49b9733..eca50d6f 100644 --- a/tests/test_hub/test_edit_tag.py +++ b/tests/test_hub/test_edit_tag.py @@ -1,7 +1,7 @@ # coding: utf-8 import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_edit_tag_external_repo.py b/tests/test_hub/test_edit_tag_external_repo.py index 3feb62ef..d97c7343 100644 --- a/tests/test_hub/test_edit_tag_external_repo.py +++ b/tests/test_hub/test_edit_tag_external_repo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_edit_user.py b/tests/test_hub/test_edit_user.py index e3e8bd77..5d63318d 100644 --- a/tests/test_hub/test_edit_user.py +++ b/tests/test_hub/test_edit_user.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_enable_channel.py b/tests/test_hub/test_enable_channel.py index 6b7a0c3f..dd8cf4e7 100644 --- a/tests/test_hub/test_enable_channel.py +++ b/tests/test_hub/test_enable_channel.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_enable_user.py b/tests/test_hub/test_enable_user.py index 739a9d8c..a1fd1169 100644 --- a/tests/test_hub/test_enable_user.py +++ b/tests/test_hub/test_enable_user.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_ensure_volume_symlink.py b/tests/test_hub/test_ensure_volume_symlink.py index e9637e91..8bf9dbb8 100644 --- a/tests/test_hub/test_ensure_volume_symlink.py +++ b/tests/test_hub/test_ensure_volume_symlink.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import os import os.path import shutil diff --git a/tests/test_hub/test_find_build_id.py b/tests/test_hub/test_find_build_id.py index 857985db..cd6d5a98 100644 --- a/tests/test_hub/test_find_build_id.py +++ b/tests/test_hub/test_find_build_id.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_getPackageID.py b/tests/test_hub/test_getPackageID.py index a9260871..a0c84261 100644 --- a/tests/test_hub/test_getPackageID.py +++ b/tests/test_hub/test_getPackageID.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_getRPM.py b/tests/test_hub/test_getRPM.py index f9ab5085..86a7ef1a 100644 --- a/tests/test_hub/test_getRPM.py +++ b/tests/test_hub/test_getRPM.py @@ -1,7 +1,7 @@ import os.path import shutil import tempfile -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_getRPMDeps.py b/tests/test_hub/test_getRPMDeps.py index 53c50d5b..0581d3ac 100644 --- a/tests/test_hub/test_getRPMDeps.py +++ b/tests/test_hub/test_getRPMDeps.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import os import unittest import koji diff --git a/tests/test_hub/test_getRPMFile.py b/tests/test_hub/test_getRPMFile.py index 6b6775d9..76a44b02 100644 --- a/tests/test_hub/test_getRPMFile.py +++ b/tests/test_hub/test_getRPMFile.py @@ -1,7 +1,7 @@ import os -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_get_active_repos.py b/tests/test_hub/test_get_active_repos.py index a061025e..59b14dde 100644 --- a/tests/test_hub/test_get_active_repos.py +++ b/tests/test_hub/test_get_active_repos.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub.repos diff --git a/tests/test_hub/test_get_archive.py b/tests/test_hub/test_get_archive.py index 9b12cb95..e82a1d57 100644 --- a/tests/test_hub/test_get_archive.py +++ b/tests/test_hub/test_get_archive.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_archive_file.py b/tests/test_hub/test_get_archive_file.py index 768cc042..ef1619fd 100644 --- a/tests/test_hub/test_get_archive_file.py +++ b/tests/test_hub/test_get_archive_file.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_get_archive_type.py b/tests/test_hub/test_get_archive_type.py index 5318a68a..4a6719b4 100644 --- a/tests/test_hub/test_get_archive_type.py +++ b/tests/test_hub/test_get_archive_type.py @@ -1,6 +1,6 @@ import koji import kojihub -import mock +from unittest import mock from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_build.py b/tests/test_hub/test_get_build.py index 59cb51da..4262ffe7 100644 --- a/tests/test_hub/test_get_build.py +++ b/tests/test_hub/test_get_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_build_config.py b/tests/test_hub/test_get_build_config.py index deb83473..8589ded8 100644 --- a/tests/test_hub/test_get_build_config.py +++ b/tests/test_hub/test_get_build_config.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import kojihub diff --git a/tests/test_hub/test_get_build_logs.py b/tests/test_hub/test_get_build_logs.py index b4b6049c..7bd3d21b 100644 --- a/tests/test_hub/test_get_build_logs.py +++ b/tests/test_hub/test_get_build_logs.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import os import shutil import tempfile diff --git a/tests/test_hub/test_get_build_notification_block.py b/tests/test_hub/test_get_build_notification_block.py index 362bd9c3..d8330268 100644 --- a/tests/test_hub/test_get_build_notification_block.py +++ b/tests/test_hub/test_get_build_notification_block.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_build_notification_blocks.py b/tests/test_hub/test_get_build_notification_blocks.py index db38cf8b..567c6ad2 100644 --- a/tests/test_hub/test_get_build_notification_blocks.py +++ b/tests/test_hub/test_get_build_notification_blocks.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_build_notifications.py b/tests/test_hub/test_get_build_notifications.py index ce201269..ad8faf4a 100644 --- a/tests/test_hub/test_get_build_notifications.py +++ b/tests/test_hub/test_get_build_notifications.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_build_target.py b/tests/test_hub/test_get_build_target.py index a4f83f4a..6d559167 100644 --- a/tests/test_hub/test_get_build_target.py +++ b/tests/test_hub/test_get_build_target.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_build_targets.py b/tests/test_hub/test_get_build_targets.py index 54ae918a..123e272b 100644 --- a/tests/test_hub/test_get_build_targets.py +++ b/tests/test_hub/test_get_build_targets.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import kojihub from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_build_type.py b/tests/test_hub/test_get_build_type.py index 50506237..3f0cf808 100644 --- a/tests/test_hub/test_get_build_type.py +++ b/tests/test_hub/test_get_build_type.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import kojihub from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_buildroot.py b/tests/test_hub/test_get_buildroot.py index 5fd85191..0ae8365c 100644 --- a/tests/test_hub/test_get_buildroot.py +++ b/tests/test_hub/test_get_buildroot.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_get_changelog_entries.py b/tests/test_hub/test_get_changelog_entries.py index 0619e0a6..bea796ee 100644 --- a/tests/test_hub/test_get_changelog_entries.py +++ b/tests/test_hub/test_get_changelog_entries.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_channel.py b/tests/test_hub/test_get_channel.py index 66cb8ff3..a8156ece 100644 --- a/tests/test_hub/test_get_channel.py +++ b/tests/test_hub/test_get_channel.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_external_repo.py b/tests/test_hub/test_get_external_repo.py index 5b63edc3..f7d1327e 100644 --- a/tests/test_hub/test_get_external_repo.py +++ b/tests/test_hub/test_get_external_repo.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_external_repo_list.py b/tests/test_hub/test_get_external_repo_list.py index ab541146..73de6f73 100644 --- a/tests/test_hub/test_get_external_repo_list.py +++ b/tests/test_hub/test_get_external_repo_list.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import kojihub diff --git a/tests/test_hub/test_get_group_members.py b/tests/test_hub/test_get_group_members.py index 0274d00c..846515ee 100644 --- a/tests/test_hub/test_get_group_members.py +++ b/tests/test_hub/test_get_group_members.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_host.py b/tests/test_hub/test_get_host.py index 66bfaac7..3590659f 100644 --- a/tests/test_hub/test_get_host.py +++ b/tests/test_hub/test_get_host.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_image_build.py b/tests/test_hub/test_get_image_build.py index 51de05c8..45f8c437 100644 --- a/tests/test_hub/test_get_image_build.py +++ b/tests/test_hub/test_get_image_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_maven_build.py b/tests/test_hub/test_get_maven_build.py index 898e3152..73b8a430 100644 --- a/tests/test_hub/test_get_maven_build.py +++ b/tests/test_hub/test_get_maven_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_next_build.py b/tests/test_hub/test_get_next_build.py index c90fd261..ecbaa68d 100644 --- a/tests/test_hub/test_get_next_build.py +++ b/tests/test_hub/test_get_next_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_next_release.py b/tests/test_hub/test_get_next_release.py index f199723c..6202a24b 100644 --- a/tests/test_hub/test_get_next_release.py +++ b/tests/test_hub/test_get_next_release.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_notification_recipients.py b/tests/test_hub/test_get_notification_recipients.py index c725a5a1..76ef3ebc 100644 --- a/tests/test_hub/test_get_notification_recipients.py +++ b/tests/test_hub/test_get_notification_recipients.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_get_rpm_checksums.py b/tests/test_hub/test_get_rpm_checksums.py index 3fec3d37..78bebea7 100644 --- a/tests/test_hub/test_get_rpm_checksums.py +++ b/tests/test_hub/test_get_rpm_checksums.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_session_info.py b/tests/test_hub/test_get_session_info.py index d364fa3c..e8855f71 100644 --- a/tests/test_hub/test_get_session_info.py +++ b/tests/test_hub/test_get_session_info.py @@ -1,6 +1,6 @@ import koji import kojihub -import mock +from unittest import mock from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_tag_external_repos.py b/tests/test_hub/test_get_tag_external_repos.py index 58c87f1d..272abc75 100644 --- a/tests/test_hub/test_get_tag_external_repos.py +++ b/tests/test_hub/test_get_tag_external_repos.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import kojihub from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_tag_groups.py b/tests/test_hub/test_get_tag_groups.py index 7449e596..22ed6dd9 100644 --- a/tests/test_hub/test_get_tag_groups.py +++ b/tests/test_hub/test_get_tag_groups.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import kojihub diff --git a/tests/test_hub/test_get_task_children.py b/tests/test_hub/test_get_task_children.py index 2c01db85..f1f4f450 100644 --- a/tests/test_hub/test_get_task_children.py +++ b/tests/test_hub/test_get_task_children.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_upload_path.py b/tests/test_hub/test_get_upload_path.py index ddb49c88..73b5035e 100644 --- a/tests/test_hub/test_get_upload_path.py +++ b/tests/test_hub/test_get_upload_path.py @@ -1,5 +1,5 @@ import os -import mock +from unittest import mock import shutil import tempfile import unittest diff --git a/tests/test_hub/test_get_user.py b/tests/test_hub/test_get_user.py index bea2584d..3030bc4e 100644 --- a/tests/test_hub/test_get_user.py +++ b/tests/test_hub/test_get_user.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_get_user_groups.py b/tests/test_hub/test_get_user_groups.py index 4b23f3fd..04d511a8 100644 --- a/tests/test_hub/test_get_user_groups.py +++ b/tests/test_hub/test_get_user_groups.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_user_perms.py b/tests/test_hub/test_get_user_perms.py index 35aba523..3b45cc3f 100644 --- a/tests/test_hub/test_get_user_perms.py +++ b/tests/test_hub/test_get_user_perms.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_volume.py b/tests/test_hub/test_get_volume.py index 24a03b63..18fb579d 100644 --- a/tests/test_hub/test_get_volume.py +++ b/tests/test_hub/test_get_volume.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_get_win_build.py b/tests/test_hub/test_get_win_build.py index 6949e51f..68df43cb 100644 --- a/tests/test_hub/test_get_win_build.py +++ b/tests/test_hub/test_get_win_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_grant_cg_access.py b/tests/test_hub/test_grant_cg_access.py index 4cb9e1a8..0476726a 100644 --- a/tests/test_hub/test_grant_cg_access.py +++ b/tests/test_hub/test_grant_cg_access.py @@ -1,6 +1,6 @@ # coding: utf-8 import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_grant_permissions.py b/tests/test_hub/test_grant_permissions.py index c79f882c..c170a067 100644 --- a/tests/test_hub/test_grant_permissions.py +++ b/tests/test_hub/test_grant_permissions.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_group_operations.py b/tests/test_hub/test_group_operations.py index 06f81aa9..167a1104 100644 --- a/tests/test_hub/test_group_operations.py +++ b/tests/test_hub/test_group_operations.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_group_pkg_operations.py b/tests/test_hub/test_group_pkg_operations.py index 23045207..35a688a8 100644 --- a/tests/test_hub/test_group_pkg_operations.py +++ b/tests/test_hub/test_group_pkg_operations.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_group_req_operations.py b/tests/test_hub/test_group_req_operations.py index dadf6e5e..e204e640 100644 --- a/tests/test_hub/test_group_req_operations.py +++ b/tests/test_hub/test_group_req_operations.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_import_archive.py b/tests/test_hub/test_import_archive.py index eb4fcf55..af6a8574 100644 --- a/tests/test_hub/test_import_archive.py +++ b/tests/test_hub/test_import_archive.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_import_archive_internal.py b/tests/test_hub/test_import_archive_internal.py index 70f64ba3..14c7a214 100644 --- a/tests/test_hub/test_import_archive_internal.py +++ b/tests/test_hub/test_import_archive_internal.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_import_build.py b/tests/test_hub/test_import_build.py index ddef0e9e..f086f3fa 100644 --- a/tests/test_hub/test_import_build.py +++ b/tests/test_hub/test_import_build.py @@ -1,5 +1,5 @@ import copy -import mock +from unittest import mock import unittest import shutil import tempfile diff --git a/tests/test_hub/test_import_image_internal.py b/tests/test_hub/test_import_image_internal.py index 435cb814..73f77ede 100644 --- a/tests/test_hub/test_import_image_internal.py +++ b/tests/test_hub/test_import_image_internal.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import os import shutil import tempfile diff --git a/tests/test_hub/test_import_rpm.py b/tests/test_hub/test_import_rpm.py index cfc33268..2f9862c7 100644 --- a/tests/test_hub/test_import_rpm.py +++ b/tests/test_hub/test_import_rpm.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_list_archive_files.py b/tests/test_hub/test_list_archive_files.py index df1de135..30d36698 100644 --- a/tests/test_hub/test_list_archive_files.py +++ b/tests/test_hub/test_list_archive_files.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_list_archives.py b/tests/test_hub/test_list_archives.py index 8744baf4..1769b8f0 100644 --- a/tests/test_hub/test_list_archives.py +++ b/tests/test_hub/test_list_archives.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_list_btypes.py b/tests/test_hub/test_list_btypes.py index 18e91530..68d927b2 100644 --- a/tests/test_hub/test_list_btypes.py +++ b/tests/test_hub/test_list_btypes.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import kojihub diff --git a/tests/test_hub/test_list_builds.py b/tests/test_hub/test_list_builds.py index 9456147f..4fded655 100644 --- a/tests/test_hub/test_list_builds.py +++ b/tests/test_hub/test_list_builds.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import kojihub diff --git a/tests/test_hub/test_list_cgs.py b/tests/test_hub/test_list_cgs.py index b90ac797..ddf82b1b 100644 --- a/tests/test_hub/test_list_cgs.py +++ b/tests/test_hub/test_list_cgs.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import kojihub import kojihub.kojihub diff --git a/tests/test_hub/test_list_channels.py b/tests/test_hub/test_list_channels.py index 4ffd7d1d..89035a20 100644 --- a/tests/test_hub/test_list_channels.py +++ b/tests/test_hub/test_list_channels.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_list_hosts.py b/tests/test_hub/test_list_hosts.py index edaa6280..d4483cc9 100644 --- a/tests/test_hub/test_list_hosts.py +++ b/tests/test_hub/test_list_hosts.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_list_packages_simple.py b/tests/test_hub/test_list_packages_simple.py index d4c2ef40..12f3683a 100644 --- a/tests/test_hub/test_list_packages_simple.py +++ b/tests/test_hub/test_list_packages_simple.py @@ -1,6 +1,6 @@ import unittest import kojihub -import mock +from unittest import mock QP = kojihub.QueryProcessor diff --git a/tests/test_hub/test_list_rpms.py b/tests/test_hub/test_list_rpms.py index 99df3883..2e114c88 100644 --- a/tests/test_hub/test_list_rpms.py +++ b/tests/test_hub/test_list_rpms.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_list_tagged.py b/tests/test_hub/test_list_tagged.py index 3990d69c..e75d8acc 100644 --- a/tests/test_hub/test_list_tagged.py +++ b/tests/test_hub/test_list_tagged.py @@ -2,7 +2,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock import copy QP = kojihub.QueryProcessor diff --git a/tests/test_hub/test_list_tagged_archives.py b/tests/test_hub/test_list_tagged_archives.py index 2ccd469e..c1b5273e 100644 --- a/tests/test_hub/test_list_tagged_archives.py +++ b/tests/test_hub/test_list_tagged_archives.py @@ -2,7 +2,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock import copy QP = kojihub.QueryProcessor diff --git a/tests/test_hub/test_list_tagged_rpms.py b/tests/test_hub/test_list_tagged_rpms.py index c93cc6aa..99962d93 100644 --- a/tests/test_hub/test_list_tagged_rpms.py +++ b/tests/test_hub/test_list_tagged_rpms.py @@ -2,7 +2,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock import copy QP = kojihub.QueryProcessor diff --git a/tests/test_hub/test_list_tags.py b/tests/test_hub/test_list_tags.py index 50a0bf85..6d2d2efb 100644 --- a/tests/test_hub/test_list_tags.py +++ b/tests/test_hub/test_list_tags.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_list_task_output.py b/tests/test_hub/test_list_task_output.py index 36e9f415..2d3cb0d9 100644 --- a/tests/test_hub/test_list_task_output.py +++ b/tests/test_hub/test_list_task_output.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import kojihub diff --git a/tests/test_hub/test_list_tasks.py b/tests/test_hub/test_list_tasks.py index 2542fb3d..3fdd9378 100644 --- a/tests/test_hub/test_list_tasks.py +++ b/tests/test_hub/test_list_tasks.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import kojihub diff --git a/tests/test_hub/test_list_user_krb_principals.py b/tests/test_hub/test_list_user_krb_principals.py index cd072669..8bccc366 100644 --- a/tests/test_hub/test_list_user_krb_principals.py +++ b/tests/test_hub/test_list_user_krb_principals.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_list_users.py b/tests/test_hub/test_list_users.py index 739119e3..06d039b2 100644 --- a/tests/test_hub/test_list_users.py +++ b/tests/test_hub/test_list_users.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_lookup_name.py b/tests/test_hub/test_lookup_name.py index 72037eeb..094c9bb9 100644 --- a/tests/test_hub/test_lookup_name.py +++ b/tests/test_hub/test_lookup_name.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_massTag.py b/tests/test_hub/test_massTag.py index 471cd2a8..ded07fdc 100644 --- a/tests/test_hub/test_massTag.py +++ b/tests/test_hub/test_massTag.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_maven_build.py b/tests/test_hub/test_maven_build.py index f50afe84..c1522dc2 100644 --- a/tests/test_hub/test_maven_build.py +++ b/tests/test_hub/test_maven_build.py @@ -1,7 +1,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock class TestMaven(unittest.TestCase): diff --git a/tests/test_hub/test_models/test_host.py b/tests/test_hub/test_models/test_host.py index 343f098c..1f6d33a9 100644 --- a/tests/test_hub/test_models/test_host.py +++ b/tests/test_hub/test_models/test_host.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_multicall.py b/tests/test_hub/test_multicall.py index a83443bc..3ad47ae7 100644 --- a/tests/test_hub/test_multicall.py +++ b/tests/test_hub/test_multicall.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest from kojihub import kojixmlrpc diff --git a/tests/test_hub/test_new_build.py b/tests/test_hub/test_new_build.py index 5b8f6f38..9c416da5 100644 --- a/tests/test_hub/test_new_build.py +++ b/tests/test_hub/test_new_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_new_image_build.py b/tests/test_hub/test_new_image_build.py index f28afce8..ae0f32fd 100644 --- a/tests/test_hub/test_new_image_build.py +++ b/tests/test_hub/test_new_image_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import kojihub import kojihub.kojihub diff --git a/tests/test_hub/test_new_maven_build.py b/tests/test_hub/test_new_maven_build.py index f1636e86..fd133782 100644 --- a/tests/test_hub/test_new_maven_build.py +++ b/tests/test_hub/test_new_maven_build.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_new_package.py b/tests/test_hub/test_new_package.py index 1d7e9a7d..b342624f 100644 --- a/tests/test_hub/test_new_package.py +++ b/tests/test_hub/test_new_package.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_new_typed_build.py b/tests/test_hub/test_new_typed_build.py index 61a9c1db..03d34405 100644 --- a/tests/test_hub/test_new_typed_build.py +++ b/tests/test_hub/test_new_typed_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import kojihub diff --git a/tests/test_hub/test_new_win_build.py b/tests/test_hub/test_new_win_build.py index 6813e54e..3937cb55 100644 --- a/tests/test_hub/test_new_win_build.py +++ b/tests/test_hub/test_new_win_build.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_perm_operations.py b/tests/test_hub/test_perm_operations.py index c76077ba..222a056b 100644 --- a/tests/test_hub/test_perm_operations.py +++ b/tests/test_hub/test_perm_operations.py @@ -1,5 +1,5 @@ -import mock +from unittest import mock import unittest diff --git a/tests/test_hub/test_pkglist.py b/tests/test_hub/test_pkglist.py index ded4a601..1c66ca1f 100644 --- a/tests/test_hub/test_pkglist.py +++ b/tests/test_hub/test_pkglist.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_policy_tests.py b/tests/test_hub/test_policy_tests.py index d8b0ca88..069c0031 100644 --- a/tests/test_hub/test_policy_tests.py +++ b/tests/test_hub/test_policy_tests.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_promote_build.py b/tests/test_hub/test_promote_build.py index e18f0a3a..351a3896 100644 --- a/tests/test_hub/test_promote_build.py +++ b/tests/test_hub/test_promote_build.py @@ -1,6 +1,6 @@ import datetime import json -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_query_buildroots.py b/tests/test_hub/test_query_buildroots.py index 019970eb..27b9fe9b 100644 --- a/tests/test_hub/test_query_buildroots.py +++ b/tests/test_hub/test_query_buildroots.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import kojihub QP = kojihub.QueryProcessor diff --git a/tests/test_hub/test_query_history.py b/tests/test_hub/test_query_history.py index d3598db3..9ecd405a 100644 --- a/tests/test_hub/test_query_history.py +++ b/tests/test_hub/test_query_history.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import os import time diff --git a/tests/test_hub/test_query_rpm_sigs.py b/tests/test_hub/test_query_rpm_sigs.py index 2e19d741..8c2b6a13 100644 --- a/tests/test_hub/test_query_rpm_sigs.py +++ b/tests/test_hub/test_query_rpm_sigs.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import kojihub diff --git a/tests/test_hub/test_query_view.py b/tests/test_hub/test_query_view.py index b1e82be4..12fdc308 100644 --- a/tests/test_hub/test_query_view.py +++ b/tests/test_hub/test_query_view.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_read_tagged_archives.py b/tests/test_hub/test_read_tagged_archives.py index da31bf02..67500b2a 100644 --- a/tests/test_hub/test_read_tagged_archives.py +++ b/tests/test_hub/test_read_tagged_archives.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_read_tagged_builds.py b/tests/test_hub/test_read_tagged_builds.py index e48df0b4..2854f0e8 100644 --- a/tests/test_hub/test_read_tagged_builds.py +++ b/tests/test_hub/test_read_tagged_builds.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_read_tagged_rpms.py b/tests/test_hub/test_read_tagged_rpms.py index a39f996e..c0773b5b 100644 --- a/tests/test_hub/test_read_tagged_rpms.py +++ b/tests/test_hub/test_read_tagged_rpms.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_recycle_build.py b/tests/test_hub/test_recycle_build.py index dcc5eb0a..f63942d4 100644 --- a/tests/test_hub/test_recycle_build.py +++ b/tests/test_hub/test_recycle_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_remove_external_repo_from_tag.py b/tests/test_hub/test_remove_external_repo_from_tag.py index 19337e63..ac949e55 100644 --- a/tests/test_hub/test_remove_external_repo_from_tag.py +++ b/tests/test_hub/test_remove_external_repo_from_tag.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_remove_host_from_channel.py b/tests/test_hub/test_remove_host_from_channel.py index 7122c5d2..1435a747 100644 --- a/tests/test_hub/test_remove_host_from_channel.py +++ b/tests/test_hub/test_remove_host_from_channel.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_remove_volume.py b/tests/test_hub/test_remove_volume.py index 6bb18e60..cb66397d 100644 --- a/tests/test_hub/test_remove_volume.py +++ b/tests/test_hub/test_remove_volume.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_repo_init.py b/tests/test_hub/test_repo_init.py index 16c13315..9f1a738c 100644 --- a/tests/test_hub/test_repo_init.py +++ b/tests/test_hub/test_repo_init.py @@ -1,5 +1,5 @@ import json -import mock +from unittest import mock import os import shutil import tempfile diff --git a/tests/test_hub/test_repo_requests.py b/tests/test_hub/test_repo_requests.py index 79d314c4..38ff4cc8 100644 --- a/tests/test_hub/test_repo_requests.py +++ b/tests/test_hub/test_repo_requests.py @@ -3,7 +3,7 @@ import shutil import tempfile import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_repos.py b/tests/test_hub/test_repos.py index c446b063..b7ef0f1f 100644 --- a/tests/test_hub/test_repos.py +++ b/tests/test_hub/test_repos.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import datetime diff --git a/tests/test_hub/test_reset_build.py b/tests/test_hub/test_reset_build.py index 23a79d94..3353500b 100644 --- a/tests/test_hub/test_reset_build.py +++ b/tests/test_hub/test_reset_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_restart_hosts.py b/tests/test_hub/test_restart_hosts.py index 4d0d8b19..92b8399e 100644 --- a/tests/test_hub/test_restart_hosts.py +++ b/tests/test_hub/test_restart_hosts.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_revoke_cg_access.py b/tests/test_hub/test_revoke_cg_access.py index 0a9f50c8..c6c05484 100644 --- a/tests/test_hub/test_revoke_cg_access.py +++ b/tests/test_hub/test_revoke_cg_access.py @@ -1,7 +1,7 @@ # coding: utf-8 import unittest -import mock +from unittest import mock import kojihub UP = kojihub.UpdateProcessor diff --git a/tests/test_hub/test_rpmdiff.py b/tests/test_hub/test_rpmdiff.py index 0b8e37ab..bc9c93f4 100644 --- a/tests/test_hub/test_rpmdiff.py +++ b/tests/test_hub/test_rpmdiff.py @@ -1,5 +1,5 @@ import copy -import mock +from unittest import mock import os import unittest diff --git a/tests/test_hub/test_scheduler.py b/tests/test_hub/test_scheduler.py index b5d030bb..a819d521 100644 --- a/tests/test_hub/test_scheduler.py +++ b/tests/test_hub/test_scheduler.py @@ -1,5 +1,5 @@ import datetime -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_set_build_owner.py b/tests/test_hub/test_set_build_owner.py index c3ad85d6..01116853 100644 --- a/tests/test_hub/test_set_build_owner.py +++ b/tests/test_hub/test_set_build_owner.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import kojihub diff --git a/tests/test_hub/test_set_build_timestamp.py b/tests/test_hub/test_set_build_timestamp.py index 8a2857de..64987cd4 100644 --- a/tests/test_hub/test_set_build_timestamp.py +++ b/tests/test_hub/test_set_build_timestamp.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import kojihub diff --git a/tests/test_hub/test_set_host_enabled.py b/tests/test_hub/test_set_host_enabled.py index 82bdf89f..07cdf51b 100644 --- a/tests/test_hub/test_set_host_enabled.py +++ b/tests/test_hub/test_set_host_enabled.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_set_user_status.py b/tests/test_hub/test_set_user_status.py index e4988340..dfb9a180 100644 --- a/tests/test_hub/test_set_user_status.py +++ b/tests/test_hub/test_set_user_status.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_show_opts.py b/tests/test_hub/test_show_opts.py index b67af5b5..ae3a57ba 100644 --- a/tests/test_hub/test_show_opts.py +++ b/tests/test_hub/test_show_opts.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import re diff --git a/tests/test_hub/test_snapshotTag.py b/tests/test_hub/test_snapshotTag.py index 4eafa0ed..0605e946 100644 --- a/tests/test_hub/test_snapshotTag.py +++ b/tests/test_hub/test_snapshotTag.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_snapshotTagModify.py b/tests/test_hub/test_snapshotTagModify.py index 8df7383f..2406ae42 100644 --- a/tests/test_hub/test_snapshotTagModify.py +++ b/tests/test_hub/test_snapshotTagModify.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji import kojihub diff --git a/tests/test_hub/test_tag_last_change_event.py b/tests/test_hub/test_tag_last_change_event.py index 96b2a131..2a18d25a 100644 --- a/tests/test_hub/test_tag_last_change_event.py +++ b/tests/test_hub/test_tag_last_change_event.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -import mock +from unittest import mock import os import re try: diff --git a/tests/test_hub/test_tag_notification.py b/tests/test_hub/test_tag_notification.py index e7f913df..fc1286fa 100644 --- a/tests/test_hub/test_tag_notification.py +++ b/tests/test_hub/test_tag_notification.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import kojihub diff --git a/tests/test_hub/test_tag_operations.py b/tests/test_hub/test_tag_operations.py index 3cf0ba8b..95b37ed0 100644 --- a/tests/test_hub/test_tag_operations.py +++ b/tests/test_hub/test_tag_operations.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_task_wait_results.py b/tests/test_hub/test_task_wait_results.py index 88316686..19b33cd6 100644 --- a/tests/test_hub/test_task_wait_results.py +++ b/tests/test_hub/test_task_wait_results.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import xmlrpc.client import unittest diff --git a/tests/test_hub/test_untagged_build.py b/tests/test_hub/test_untagged_build.py index e6336ab1..6ed7f578 100644 --- a/tests/test_hub/test_untagged_build.py +++ b/tests/test_hub/test_untagged_build.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import kojihub import kojihub.kojihub diff --git a/tests/test_hub/test_update_notification.py b/tests/test_hub/test_update_notification.py index 086b2c6e..1211c1d4 100644 --- a/tests/test_hub/test_update_notification.py +++ b/tests/test_hub/test_update_notification.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_upsert_processor.py b/tests/test_hub/test_upsert_processor.py index cf7aee8d..efddb4b2 100644 --- a/tests/test_hub/test_upsert_processor.py +++ b/tests/test_hub/test_upsert_processor.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_hub/test_user_groups.py b/tests/test_hub/test_user_groups.py index 746afdcc..ee6af107 100644 --- a/tests/test_hub/test_user_groups.py +++ b/tests/test_hub/test_user_groups.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_verify_names.py b/tests/test_hub/test_verify_names.py index 2fcc3979..0c39a698 100644 --- a/tests/test_hub/test_verify_names.py +++ b/tests/test_hub/test_verify_names.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock import re import koji diff --git a/tests/test_hub/test_win_build.py b/tests/test_hub/test_win_build.py index f60325b1..8fa7889e 100644 --- a/tests/test_hub/test_win_build.py +++ b/tests/test_hub/test_win_build.py @@ -1,7 +1,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock class TestWinBuild(unittest.TestCase): diff --git a/tests/test_hub/test_wrapper_rpm.py b/tests/test_hub/test_wrapper_rpm.py index aed6437f..318ac5b9 100644 --- a/tests/test_hub/test_wrapper_rpm.py +++ b/tests/test_hub/test_wrapper_rpm.py @@ -1,7 +1,7 @@ import unittest import koji import kojihub -import mock +from unittest import mock class TestWrapperRPM(unittest.TestCase): diff --git a/tests/test_hub/test_write_inheritance_data.py b/tests/test_hub/test_write_inheritance_data.py index f5b3de1a..7a7042ee 100644 --- a/tests/test_hub/test_write_inheritance_data.py +++ b/tests/test_hub/test_write_inheritance_data.py @@ -1,7 +1,7 @@ # coding: utf-8 import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/test_write_maven_repo_metadata.py b/tests/test_hub/test_write_maven_repo_metadata.py index 461198a1..de7af40c 100644 --- a/tests/test_hub/test_write_maven_repo_metadata.py +++ b/tests/test_hub/test_write_maven_repo_metadata.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import os import datetime import unittest diff --git a/tests/test_hub/test_write_signed_rpm.py b/tests/test_hub/test_write_signed_rpm.py index 1037db16..7c8c7ca0 100644 --- a/tests/test_hub/test_write_signed_rpm.py +++ b/tests/test_hub/test_write_signed_rpm.py @@ -1,5 +1,5 @@ import unittest -import mock +from unittest import mock import koji import kojihub diff --git a/tests/test_hub/utils.py b/tests/test_hub/utils.py index 561e70a7..52ee68aa 100644 --- a/tests/test_hub/utils.py +++ b/tests/test_hub/utils.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import kojihub diff --git a/tests/test_kojira/test_managed_repo.py b/tests/test_kojira/test_managed_repo.py index 52f8ce14..56bda2a7 100644 --- a/tests/test_kojira/test_managed_repo.py +++ b/tests/test_kojira/test_managed_repo.py @@ -1,6 +1,6 @@ from __future__ import absolute_import import json -import mock +from unittest import mock import os.path import shutil import tempfile diff --git a/tests/test_kojira/test_repo_manager.py b/tests/test_kojira/test_repo_manager.py index 1a6131dc..85ec47ef 100644 --- a/tests/test_kojira/test_repo_manager.py +++ b/tests/test_kojira/test_repo_manager.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -import mock +from unittest import mock import os.path import shutil import tempfile diff --git a/tests/test_lib/test_auth.py b/tests/test_lib/test_auth.py index fb5386c0..367bd479 100644 --- a/tests/test_lib/test_auth.py +++ b/tests/test_lib/test_auth.py @@ -1,6 +1,9 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import unittest diff --git a/tests/test_lib/test_build_label.py b/tests/test_lib/test_build_label.py index f835af35..aba71a3d 100644 --- a/tests/test_lib/test_build_label.py +++ b/tests/test_lib/test_build_label.py @@ -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 diff --git a/tests/test_lib/test_client_session.py b/tests/test_lib/test_client_session.py index fb3de765..dda17cbc 100644 --- a/tests/test_lib/test_client_session.py +++ b/tests/test_lib/test_client_session.py @@ -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 diff --git a/tests/test_lib/test_file_ops.py b/tests/test_lib/test_file_ops.py index 1aa2a126..23de1b35 100644 --- a/tests/test_lib/test_file_ops.py +++ b/tests/test_lib/test_file_ops.py @@ -2,7 +2,10 @@ from __future__ import absolute_import import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import errno from koji import ensuredir diff --git a/tests/test_lib/test_fixEncoding.py b/tests/test_lib/test_fixEncoding.py index eaf8b97a..2ccd6fec 100644 --- a/tests/test_lib/test_fixEncoding.py +++ b/tests/test_lib/test_fixEncoding.py @@ -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 diff --git a/tests/test_lib/test_gssapi.py b/tests/test_lib/test_gssapi.py index 6249221c..b4ad3adc 100644 --- a/tests/test_lib/test_gssapi.py +++ b/tests/test_lib/test_gssapi.py @@ -1,6 +1,9 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import os import unittest diff --git a/tests/test_lib/test_insert_processor.py b/tests/test_lib/test_insert_processor.py index 2c63450d..9d954c41 100644 --- a/tests/test_lib/test_insert_processor.py +++ b/tests/test_lib/test_insert_processor.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import unittest import koji diff --git a/tests/test_lib/test_multicall_session.py b/tests/test_lib/test_multicall_session.py index c4978e47..d0bf2cd2 100644 --- a/tests/test_lib/test_multicall_session.py +++ b/tests/test_lib/test_multicall_session.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import unittest import koji diff --git a/tests/test_lib/test_parsers.py b/tests/test_lib/test_parsers.py index d80d1c0b..619c6f07 100644 --- a/tests/test_lib/test_parsers.py +++ b/tests/test_lib/test_parsers.py @@ -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 diff --git a/tests/test_lib/test_plugin.py b/tests/test_lib/test_plugin.py index d76bbeb0..1aec576c 100644 --- a/tests/test_lib/test_plugin.py +++ b/tests/test_lib/test_plugin.py @@ -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 diff --git a/tests/test_lib/test_profiles.py b/tests/test_lib/test_profiles.py index c920c08d..6e5bba3c 100644 --- a/tests/test_lib/test_profiles.py +++ b/tests/test_lib/test_profiles.py @@ -3,7 +3,10 @@ import koji import sys import threading import traceback -import mock +try: + from unittest import mock +except ImportError: + import mock from six.moves import range import unittest diff --git a/tests/test_lib/test_query_processor.py b/tests/test_lib/test_query_processor.py index 2e7513b9..4b1e3a6a 100644 --- a/tests/test_lib/test_query_processor.py +++ b/tests/test_lib/test_query_processor.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import unittest import kojihub diff --git a/tests/test_lib/test_repowatcher.py b/tests/test_lib/test_repowatcher.py index bdc3453c..f241380a 100644 --- a/tests/test_lib/test_repowatcher.py +++ b/tests/test_lib/test_repowatcher.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import unittest diff --git a/tests/test_lib/test_restart_tasks.py b/tests/test_lib/test_restart_tasks.py index d307585b..5dcf74fb 100644 --- a/tests/test_lib/test_restart_tasks.py +++ b/tests/test_lib/test_restart_tasks.py @@ -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 diff --git a/tests/test_lib/test_savepoint.py b/tests/test_lib/test_savepoint.py index 87a2e2c7..ac44d405 100644 --- a/tests/test_lib/test_savepoint.py +++ b/tests/test_lib/test_savepoint.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import unittest diff --git a/tests/test_lib/test_tasks.py b/tests/test_lib/test_tasks.py index 7cb897c4..7e76015f 100644 --- a/tests/test_lib/test_tasks.py +++ b/tests/test_lib/test_tasks.py @@ -1,16 +1,20 @@ from __future__ import absolute_import -import mock + import os -import random +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 + +import requests_mock import shutil import six from six.moves import range -import tempfile -import unittest - -from os import path, makedirs -from mock import patch, MagicMock, Mock, call -import requests_mock import koji from koji.tasks import BaseTaskHandler, FakeTask, ForkTask, SleepTask, WaitTestTask, scan_mounts, \ diff --git a/tests/test_lib/test_update_processor.py b/tests/test_lib/test_update_processor.py index aadfeab5..90322765 100644 --- a/tests/test_lib/test_update_processor.py +++ b/tests/test_lib/test_update_processor.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import unittest import kojihub diff --git a/tests/test_lib/test_utils.py b/tests/test_lib/test_utils.py index 79aa4148..691dcb4c 100644 --- a/tests/test_lib/test_utils.py +++ b/tests/test_lib/test_utils.py @@ -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): diff --git a/tests/test_plugins/test_kiwi_builder.py b/tests/test_plugins/test_kiwi_builder.py index 2278ece1..a1275a3f 100644 --- a/tests/test_plugins/test_kiwi_builder.py +++ b/tests/test_plugins/test_kiwi_builder.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import tempfile import unittest diff --git a/tests/test_plugins/test_kiwi_cli.py b/tests/test_plugins/test_kiwi_cli.py index f50769a1..10e37f62 100644 --- a/tests/test_plugins/test_kiwi_cli.py +++ b/tests/test_plugins/test_kiwi_cli.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import io import os import sys diff --git a/tests/test_plugins/test_kiwi_hub.py b/tests/test_plugins/test_kiwi_hub.py index cd5c7f68..f31a4831 100644 --- a/tests/test_plugins/test_kiwi_hub.py +++ b/tests/test_plugins/test_kiwi_hub.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_plugins/test_protonmsg.py b/tests/test_plugins/test_protonmsg.py index 92d226e4..8120adc0 100644 --- a/tests/test_plugins/test_protonmsg.py +++ b/tests/test_plugins/test_protonmsg.py @@ -6,9 +6,13 @@ import unittest 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: diff --git a/tests/test_plugins/test_runroot_builder.py b/tests/test_plugins/test_runroot_builder.py index c5a99c58..f9459254 100644 --- a/tests/test_plugins/test_runroot_builder.py +++ b/tests/test_plugins/test_runroot_builder.py @@ -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 diff --git a/tests/test_plugins/test_runroot_cli.py b/tests/test_plugins/test_runroot_cli.py index b3ad462d..15360c0d 100644 --- a/tests/test_plugins/test_runroot_cli.py +++ b/tests/test_plugins/test_runroot_cli.py @@ -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 diff --git a/tests/test_plugins/test_runroot_hub.py b/tests/test_plugins/test_runroot_hub.py index 7bb5584f..d70ab4c1 100644 --- a/tests/test_plugins/test_runroot_hub.py +++ b/tests/test_plugins/test_runroot_hub.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_plugins/test_save_failed_tree_builder.py b/tests/test_plugins/test_save_failed_tree_builder.py index 920f6059..a6eb179b 100644 --- a/tests/test_plugins/test_save_failed_tree_builder.py +++ b/tests/test_plugins/test_save_failed_tree_builder.py @@ -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 diff --git a/tests/test_plugins/test_save_failed_tree_cli.py b/tests/test_plugins/test_save_failed_tree_cli.py index 9bb65bbc..016b6a53 100644 --- a/tests/test_plugins/test_save_failed_tree_cli.py +++ b/tests/test_plugins/test_save_failed_tree_cli.py @@ -1,5 +1,8 @@ from __future__ import absolute_import -import mock +try: + from unittest import mock +except ImportError: + import mock import six import unittest diff --git a/tests/test_plugins/test_sidetag_cli.py b/tests/test_plugins/test_sidetag_cli.py index 10c8a756..be7c4160 100644 --- a/tests/test_plugins/test_sidetag_cli.py +++ b/tests/test_plugins/test_sidetag_cli.py @@ -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 diff --git a/tests/test_plugins/test_sidetag_hub.py b/tests/test_plugins/test_sidetag_hub.py index 255c9437..ed0dd3a5 100644 --- a/tests/test_plugins/test_sidetag_hub.py +++ b/tests/test_plugins/test_sidetag_hub.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_scm.py b/tests/test_scm.py index 3e95acec..1b83d93e 100644 --- a/tests/test_scm.py +++ b/tests/test_scm.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -import mock +from unittest import mock import shutil import six import tempfile diff --git a/tests/test_www/test_activesessiondelete.py b/tests/test_www/test_activesessiondelete.py index 3f62f111..5b1be8cc 100644 --- a/tests/test_www/test_activesessiondelete.py +++ b/tests/test_www/test_activesessiondelete.py @@ -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 diff --git a/tests/test_www/test_archiveinfo.py b/tests/test_www/test_archiveinfo.py index 674273c5..7e085530 100644 --- a/tests/test_www/test_archiveinfo.py +++ b/tests/test_www/test_archiveinfo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest from .loadwebindex import webidx diff --git a/tests/test_www/test_archivelist.py b/tests/test_www/test_archivelist.py index 501d2313..4dbc63d8 100644 --- a/tests/test_www/test_archivelist.py +++ b/tests/test_www/test_archivelist.py @@ -1,7 +1,7 @@ import unittest import koji -import mock +from unittest import mock from .loadwebindex import webidx diff --git a/tests/test_www/test_buildinfo.py b/tests/test_www/test_buildinfo.py index ed590bfc..2d58fc10 100644 --- a/tests/test_www/test_buildinfo.py +++ b/tests/test_www/test_buildinfo.py @@ -1,7 +1,7 @@ import unittest import koji -import mock +from unittest import mock from .loadwebindex import webidx diff --git a/tests/test_www/test_buildrootinfo.py b/tests/test_www/test_buildrootinfo.py index 7e4c2128..5da978c7 100644 --- a/tests/test_www/test_buildrootinfo.py +++ b/tests/test_www/test_buildrootinfo.py @@ -1,7 +1,7 @@ import unittest import koji -import mock +from unittest import mock from .loadwebindex import webidx diff --git a/tests/test_www/test_buildtargetcreate.py b/tests/test_www/test_buildtargetcreate.py index 74057d13..18b5db8b 100644 --- a/tests/test_www/test_buildtargetcreate.py +++ b/tests/test_www/test_buildtargetcreate.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import cgi diff --git a/tests/test_www/test_buildtargetdelete.py b/tests/test_www/test_buildtargetdelete.py index e48eb19c..ed46dc75 100644 --- a/tests/test_www/test_buildtargetdelete.py +++ b/tests/test_www/test_buildtargetdelete.py @@ -1,6 +1,6 @@ from __future__ import absolute_import import unittest -import mock +from unittest import mock import koji from koji.server import ServerRedirect diff --git a/tests/test_www/test_buildtargetedit.py b/tests/test_www/test_buildtargetedit.py index 9713d578..b390ba2a 100644 --- a/tests/test_www/test_buildtargetedit.py +++ b/tests/test_www/test_buildtargetedit.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import cgi diff --git a/tests/test_www/test_buildtargetinfo.py b/tests/test_www/test_buildtargetinfo.py index 668b7e90..98ecc030 100644 --- a/tests/test_www/test_buildtargetinfo.py +++ b/tests/test_www/test_buildtargetinfo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_www/test_cancelbuild.py b/tests/test_www/test_cancelbuild.py index ea96a082..159c589c 100644 --- a/tests/test_www/test_cancelbuild.py +++ b/tests/test_www/test_cancelbuild.py @@ -1,7 +1,7 @@ import unittest import koji -import mock +from unittest import mock from .loadwebindex import webidx from koji.server import ServerRedirect diff --git a/tests/test_www/test_canceltask.py b/tests/test_www/test_canceltask.py index 49c90ea2..976c91b9 100644 --- a/tests/test_www/test_canceltask.py +++ b/tests/test_www/test_canceltask.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock from .loadwebindex import webidx from koji.server import ServerRedirect diff --git a/tests/test_www/test_channelinfo.py b/tests/test_www/test_channelinfo.py index b7db290b..9d6fc6b3 100644 --- a/tests/test_www/test_channelinfo.py +++ b/tests/test_www/test_channelinfo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_www/test_disablehost.py b/tests/test_www/test_disablehost.py index d1008914..fa963fcd 100644 --- a/tests/test_www/test_disablehost.py +++ b/tests/test_www/test_disablehost.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock from .loadwebindex import webidx from koji.server import ServerRedirect diff --git a/tests/test_www/test_enablehost.py b/tests/test_www/test_enablehost.py index 45013062..e230d906 100644 --- a/tests/test_www/test_enablehost.py +++ b/tests/test_www/test_enablehost.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock from .loadwebindex import webidx from koji.server import ServerRedirect diff --git a/tests/test_www/test_externalrepoinfo.py b/tests/test_www/test_externalrepoinfo.py index 60c96247..eba41f2e 100644 --- a/tests/test_www/test_externalrepoinfo.py +++ b/tests/test_www/test_externalrepoinfo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest from .loadwebindex import webidx diff --git a/tests/test_www/test_fileinfo.py b/tests/test_www/test_fileinfo.py index 4630f271..45909d5c 100644 --- a/tests/test_www/test_fileinfo.py +++ b/tests/test_www/test_fileinfo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_www/test_freetask.py b/tests/test_www/test_freetask.py index 68124b3e..0dbd2669 100644 --- a/tests/test_www/test_freetask.py +++ b/tests/test_www/test_freetask.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock from .loadwebindex import webidx from koji.server import ServerRedirect diff --git a/tests/test_www/test_hostedit.py b/tests/test_www/test_hostedit.py index a55a7b17..5a9c4dde 100644 --- a/tests/test_www/test_hostedit.py +++ b/tests/test_www/test_hostedit.py @@ -2,7 +2,7 @@ import unittest import koji import cgi -import mock +from unittest import mock from io import BytesIO from .loadwebindex import webidx from koji.server import ServerRedirect diff --git a/tests/test_www/test_hostinfo.py b/tests/test_www/test_hostinfo.py index b46e9a57..5244c681 100644 --- a/tests/test_www/test_hostinfo.py +++ b/tests/test_www/test_hostinfo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_www/test_notificationcreate.py b/tests/test_www/test_notificationcreate.py index b3c737dc..a1920901 100644 --- a/tests/test_www/test_notificationcreate.py +++ b/tests/test_www/test_notificationcreate.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import cgi diff --git a/tests/test_www/test_notificationdelete.py b/tests/test_www/test_notificationdelete.py index dc462fe5..6b852e63 100644 --- a/tests/test_www/test_notificationdelete.py +++ b/tests/test_www/test_notificationdelete.py @@ -1,7 +1,7 @@ import unittest import koji -import mock +from unittest import mock from .loadwebindex import webidx from koji.server import ServerRedirect diff --git a/tests/test_www/test_notificationedit.py b/tests/test_www/test_notificationedit.py index b89531d3..ff8d84f7 100644 --- a/tests/test_www/test_notificationedit.py +++ b/tests/test_www/test_notificationedit.py @@ -2,7 +2,7 @@ import unittest import koji import cgi -import mock +from unittest import mock from io import BytesIO from .loadwebindex import webidx from koji.server import ServerRedirect diff --git a/tests/test_www/test_packageinfo.py b/tests/test_www/test_packageinfo.py index e9194bfb..698649d4 100644 --- a/tests/test_www/test_packageinfo.py +++ b/tests/test_www/test_packageinfo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_www/test_repoinfo.py b/tests/test_www/test_repoinfo.py index 5d450033..2ab51ec5 100644 --- a/tests/test_www/test_repoinfo.py +++ b/tests/test_www/test_repoinfo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest from .loadwebindex import webidx diff --git a/tests/test_www/test_resubmittask.py b/tests/test_www/test_resubmittask.py index f6931794..33ddab92 100644 --- a/tests/test_www/test_resubmittask.py +++ b/tests/test_www/test_resubmittask.py @@ -1,6 +1,6 @@ import unittest -import mock +from unittest import mock from .loadwebindex import webidx from koji.server import ServerRedirect diff --git a/tests/test_www/test_rpminfo.py b/tests/test_www/test_rpminfo.py index 3007627d..02368a90 100644 --- a/tests/test_www/test_rpminfo.py +++ b/tests/test_www/test_rpminfo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import koji diff --git a/tests/test_www/test_rpmlist.py b/tests/test_www/test_rpmlist.py index 61e24e55..b02e75d0 100644 --- a/tests/test_www/test_rpmlist.py +++ b/tests/test_www/test_rpmlist.py @@ -1,7 +1,7 @@ import unittest import koji -import mock +from unittest import mock from .loadwebindex import webidx diff --git a/tests/test_www/test_search.py b/tests/test_www/test_search.py index 46189235..55de90a3 100644 --- a/tests/test_www/test_search.py +++ b/tests/test_www/test_search.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import cgi diff --git a/tests/test_www/test_tagcreate.py b/tests/test_www/test_tagcreate.py index 34fd5377..69296989 100644 --- a/tests/test_www/test_tagcreate.py +++ b/tests/test_www/test_tagcreate.py @@ -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 diff --git a/tests/test_www/test_tagdelete.py b/tests/test_www/test_tagdelete.py index 1357af3b..a54f3daa 100644 --- a/tests/test_www/test_tagdelete.py +++ b/tests/test_www/test_tagdelete.py @@ -1,5 +1,5 @@ -import mock import unittest +from unittest import mock import koji from .loadwebindex import webidx diff --git a/tests/test_www/test_tagedit.py b/tests/test_www/test_tagedit.py index b9418d99..73688fc6 100644 --- a/tests/test_www/test_tagedit.py +++ b/tests/test_www/test_tagedit.py @@ -2,7 +2,7 @@ import unittest import koji import cgi -import mock +from unittest import mock from io import BytesIO from .loadwebindex import webidx from koji.server import ServerRedirect diff --git a/tests/test_www/test_tagparent.py b/tests/test_www/test_tagparent.py index f89a3074..da98e237 100644 --- a/tests/test_www/test_tagparent.py +++ b/tests/test_www/test_tagparent.py @@ -1,6 +1,6 @@ from __future__ import absolute_import import unittest -import mock +from unittest import mock import cgi import koji diff --git a/tests/test_www/test_taskinfo.py b/tests/test_www/test_taskinfo.py index e18dad27..4972fcc5 100644 --- a/tests/test_www/test_taskinfo.py +++ b/tests/test_www/test_taskinfo.py @@ -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 diff --git a/tests/test_www/test_userinfo.py b/tests/test_www/test_userinfo.py index 5d95133c..267c9fca 100644 --- a/tests/test_www/test_userinfo.py +++ b/tests/test_www/test_userinfo.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest from .loadwebindex import webidx