From ca05418fb5d3c821aef4acde780d63f0d15ee35c Mon Sep 17 00:00:00 2001 From: Yuming Zhu Date: Oct 23 2024 16:35:30 +0000 Subject: unittest: use unittest.mock instead of mock because the absence of unittest.mock on python2.7, we still fallback to mock --- diff --git a/tests/test_builder/test_build_notification.py b/tests/test_builder/test_build_notification.py index 5f09b4b..b2d1056 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 a78d916..7718d49 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 b24e56c..98018c6 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 166aecf..7ef97d9 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 e1480d6..eb87964 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 701df02..17bf2fa 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 fe81429..c3dc33e 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 d0b07d0..9a3206b 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 7b01998..15c6c0e 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 0445e3d..79754be 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 24cabb4..17596f8 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 97622ef..17fa025 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 dd2fa26..7819909 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 9502bb7..db7c79d 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 12615b9..e10e89d 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 9dce667..b6dc019 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 6e85bf4..5ade34b 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 50739da..5272f87 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 5b7b2dd..04100c9 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 892be39..d305456 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 78aa924..057320b 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 afea994..fe92c1e 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 ca4f740..cab564a 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 ed9f62c..d2ce393 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 f483108..2b5f499 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 52d6d60..3ac65b2 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 47a79fb..2d312ef 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 25c1ca4..8d466d3 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 750b823..4d807b5 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 e16d852..11b6fce 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 c0180f6..f26dbae 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 378849b..18297e7 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 580165c..7c90f51 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 f5dd01b..e881f59 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 fec6ee6..f4edcf4 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 03b3d96..d1f2558 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 a101c29..5f4a96f 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 7e21d22..d75dd2b 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 591b9b7..e62e388 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 cde3408..e8fb19d 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 05fe08f..955adfe 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 ca7bb64..8e562ec 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 6fb54ec..112576c 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 f4c5f05..28ffa70 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 8cd2210..6ba56f7 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 7f6cf68..140d146 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 -import koji +try: + from unittest import mock + from unittest.mock import call +except ImportError: + import mock + from mock import call -from mock import call +import six +import koji from koji_cli.commands import handle_edit_host from . import utils diff --git a/tests/test_cli/test_edit_notification.py b/tests/test_cli/test_edit_notification.py index 09954dc..5801bb8 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 c03462f..5a1c106 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 ae6661f..dfd0a97 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 87eec6e..980513a 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 57a6c53..937e96d 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 1bc31ed..afdb6cf 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 f1243e1..687601c 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 bb9721e..b81925d 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 9438ef0..2c803ed 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 5e1f40f..e62775e 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 5a0dd52..3caed38 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 d2ba71b..c2c2aae 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 f5df6ef..ba6f778 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 079e68c..d1f0bec 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 87bf57c..4cb3a69 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 ea44c27..728c0ce 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 fd556bb..9e674fb 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 381efad..7a916c4 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 b6f0706..4d2603f 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 852945a..d384dcb 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 de2f82f..62daebd 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 2f1519a..00bdb4a 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 0cef965..d572e8c 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 3d007ca..afd560f 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 89e7b61..99f1b21 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 4f0875a..db0bfb7 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 747ebed..30c7e6f 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 63c134b..81d2c92 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 1bdf670..eef0021 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 441d746..b06e852 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 c3286dc..89c52db 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 698653a..a5a2071 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 ef8f643..9754193 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 9fb5157..437227c 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 5c7c28f..f85634f 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 9be5e43..bbf437d 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 1e1aec5..e574ae2 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 f91ae4e..52f179a 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 aa8f59c..bd2d408 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 461d9d6..f7be7d5 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 ddf67dd..dc02b5b 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 bf251c3..1eabb5c 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 dc7eff2..ead0efe 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 890eba2..97ea3b6 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 c9aa6a3..1cbc2b2 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 eda072f..996ab4f 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 c4c8c64..981f043 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 0e54ebb..abdb7f9 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 18f4e3a..0e3a57a 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 c054cab..95faef2 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 c836edb..1e58dcc 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 49530aa..9a51d64 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 f568ad3..1bbd5fa 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 8fb2f91..9091b6f 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 268b07e..337f592 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 c3cacc3..a6b058f 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 76bc8dc..3a73a5d 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 bccfb33..5578a58 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 8d28c6b..e060e1f 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 45dd7f8..97e1b8c 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 67441d6..14a5558 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 a0c261d..9514cbe 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 45b0e0e..bdcc5fd 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 e175c5d..970c65f 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 4d81b29..8078363 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 75a6222..3d9219d 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 8b3107c..ad5ba69 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 e532df0..afd4bf9 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 e4784f4..8f8257d 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 9829782..68ac23b 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 2996c2a..946500a 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 33302f1..994da1c 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 fd4ecaf..3d00208 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 03bef5e..a65d436 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 2933388..ebc23df 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 dda93d3..7296bd8 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 15ef148..c419d20 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 9de23e2..ba8bc13 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 f7efef0..e7b042e 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 aa1ec3e..1d26dcc 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 9796bd8..688bf83 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 7ae184e..8ca27bf 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 5b20a2d..e5d44df 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 fd2c80b..61c9859 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 1fb25d1..4231a51 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 7252c88..41c6e7d 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 5d2d6ca..bc17443 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 c291998..7fe220e 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 ec524fd..3341597 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 9a3ce95..a6c0775 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 2d301f6..2f2714e 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 2463067..34c782b 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 9f09cc1..1971edb 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 bac4a67..cb252e6 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 507b5d4..44c9f73 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 6d1edee..d12128f 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 3ac2b51..3cf113f 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 68a0440..7cc1d18 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 04a473f..2291387 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 4fe0f66..804ab31 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 cf872a4..20afd91 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 50a6764..d47683f 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 e63b55f..1f52228 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 55b9238..5340ca9 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 8bb569c..6e7da40 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 7513ac9..e420cc5 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 ad13fdd..d6b8421 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 d92b08a..ce8e09e 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 674e393..e92ea83 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 0db9d2d..d127f6f 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 22ccad0..c49b0d4 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 12212b1..55557bd 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 49a29dc..9bfed89 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 a7d6cfb..33b7aab 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 25809d9..f020127 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 87f108d..3869961 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 6da3288..ba2eac3 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 042e37d..1470490 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 54f6a06..b856a69 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 191fa3b..55c2f2f 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 ee828e1..f9d5d56 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 17f4972..df03a91 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 14d8e9c..74ff67b 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 53388c7..65bcfff 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 2db4c64..421e888 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 53aa9fa..95e82e5 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 ef444ad..14a05cc 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 b894862..d56e76b 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 d8200c7..5ecc909 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 6f0ab60..e182c59 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 00cf221..27ad489 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 3d2bbef..7be05ad 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 9fd50ac..a77fe7a 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 6e8f224..2c7f27d 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 2303f5b..17e96c8 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 d6720ed..1083de2 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 bbd0da0..88ace19 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 907c033..bf76300 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 759c1e4..f9445b7 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 c8d900a..4f7650b 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 94cb3a1..7932966 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 471ff14..fa3a469 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 114686e..8c25078 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 526af20..a2d8fad 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 c59e4da..9b603a8 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 28fcc03..fb30945 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 75719e4..144c49e 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 7a349a8..5b50798 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 d49b973..eca50d6 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 3feb62e..d97c734 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 e3e8bd7..5d63318 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 6b7a0c3..dd8cf4e 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 739a9d8..a1fd116 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 e9637e9..8bf9dbb 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 857985d..cd6d5a9 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 a926087..a0c8426 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 f9ab508..86a7ef1 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 53c50d5..0581d3a 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 6b6775d..76a44b0 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 a061025..59b14dd 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 9b12cb9..e82a1d5 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 768cc04..ef1619f 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 5318a68..4a6719b 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 59cb51d..4262ffe 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 deb8347..8589ded 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 b4b6049..7bd3d21 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 362bd9c..d833026 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 db38cf8..567c6ad 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 ce20126..ad8faf4 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 a4f83f4..6d55916 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 54ae918..123e272 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 5050623..3f0cf80 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 5fd8519..0ae8365 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 0619e0a..bea796e 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 66cb8ff..a8156ec 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 5b63edc..f7d1327 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 ab54114..73de6f7 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 0274d00..846515e 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 66bfaac..3590659 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 51de05c..45f8c43 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 898e315..73b8a43 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 c90fd26..ecbaa68 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 f199723..6202a24 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 c725a5a..76ef3eb 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 3fec3d3..78bebea 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 d364fa3..e8855f7 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 58c87f1..272abc7 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 7449e59..22ed6dd 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 2c01db8..f1f4f45 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 ddb49c8..73b5035 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 bea2584..3030bc4 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 4b23f3f..04d511a 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 35aba52..3b45cc3 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 24a03b6..18fb579 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 6949e51..68df43c 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 4cb9e1a..0476726 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 c79f882..c170a06 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 06f81aa..167a110 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 2304520..35a688a 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 dadf6e5..e204e64 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 eb4fcf5..af6a857 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 70f64ba..14c7a21 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 ddef0e9..f086f3f 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 435cb81..73f77ed 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 cfc3326..2f9862c 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 df1de13..30d3669 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 8744baf..1769b8f 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 18e9153..68d927b 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 9456147..4fded65 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 b90ac79..ddf82b1 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 4ffd7d1..89035a2 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 edaa628..d4483cc 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 d4c2ef4..12f3683 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 99df388..2e114c8 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 3990d69..e75d8ac 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 2ccd469..c1b5273 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 c93cc6a..99962d9 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 50a0bf8..6d2d2ef 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 36e9f41..2d3cb0d 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 2542fb3..3fdd937 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 cd07266..8bccc36 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 739119e..06d039b 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 72037ee..094c9bb 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 471cd2a..ded07fd 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 f50afe8..c1522dc 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 343f098..1f6d33a 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 a83443b..3ad47ae 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 5b8f6f3..9c416da 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 f28afce..ae0f32f 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 f1636e8..fd13378 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 1d7e9a7..b342624 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 61a9c1d..03d3440 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 6813e54..3937cb5 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 c76077b..222a056 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 ded4a60..1c66ca1 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 d8b0ca8..069c003 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 e18f0a3..351a389 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 019970e..27b9fe9 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 d3598db..9ecd405 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 2e19d74..8c2b6a1 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 b1e82be..12fdc30 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 da31bf0..67500b2 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 e48df0b..2854f0e 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 a39f996..c0773b5 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 dcc5eb0..f63942d 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 19337e6..ac949e5 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 7122c5d..1435a74 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 6bb18e6..cb66397 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 16c1331..9f1a738 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 79d314c..38ff4cc 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 c446b06..b7ef0f1 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 23a79d9..3353500 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 4d0d8b1..92b8399 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 0a9f50c..c6c0548 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 0b8e37a..bc9c93f 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 b5d030b..a819d52 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 c3ad85d..0111685 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 8a2857d..64987cd 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 82bdf89..07cdf51 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 e498834..dfb9a18 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 b67af5b..ae3a57b 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 4eafa0e..0605e94 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 8df7383..2406ae4 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 96b2a13..2a18d25 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 e7f913d..fc1286f 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 3cf0ba8..95b37ed 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 8831668..19b33cd 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 e6336ab..6ed7f57 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 086b2c6..1211c1d 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 cf7aee8..efddb4b 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 746afdc..ee6af10 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 2fcc397..0c39a69 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 f60325b..8fa7889 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 aed6437..318ac5b 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 f5b3de1..7a7042e 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 461198a..de7af40 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 1037db1..7c8c7ca 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 561e70a..52ee68a 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 52f8ce1..56bda2a 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 1a6131d..85ec47e 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 fb5386c..367bd47 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 f835af3..aba71a3 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 fb3de76..dda17cb 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 1aa2a12..23de1b3 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 eaf8b97..2ccd6fe 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 6249221..b4ad3ad 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 2c63450..9d954c4 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 c4978e4..d0bf2cd 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 d80d1c0..619c6f0 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 d76bbeb..1aec576 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 c920c08..6e5bba3 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 2e7513b..4b1e3a6 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 bdc3453..f241380 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 d307585..5dcf74f 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 87a2e2c..ac44d40 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 7cb897c..7e76015 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 -import shutil -import six -from six.moves import range +from os import path, makedirs import tempfile import unittest +try: + from unittest import mock + from unittest.mock import patch, MagicMock, Mock, call +except ImportError: + import mock + from mock import patch, MagicMock, Mock, call -from os import path, makedirs -from mock import patch, MagicMock, Mock, call import requests_mock +import shutil +import six +from six.moves import range import koji from koji.tasks import BaseTaskHandler, FakeTask, ForkTask, SleepTask, WaitTestTask, scan_mounts, \ diff --git a/tests/test_lib/test_update_processor.py b/tests/test_lib/test_update_processor.py index aadfeab..9032276 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 79aa414..691dcb4 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 2278ece..a1275a3 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 f50769a..10e37f6 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 cd5c7f6..f31a483 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 92d226e..8120adc 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 c5a99c5..f945925 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 b3ad462..15360c0 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 7bb5584..d70ab4c 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 920f605..a6eb179 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 9bb65bb..016b6a5 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 10c8a75..be7c416 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 255c943..ed0dd3a 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 3e95ace..1b83d93 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 3f62f11..5b1be8c 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 674273c..7e08553 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 501d231..4dbc63d 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 ed590bf..2d58fc1 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 7e4c212..5da978c 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 74057d1..18b5db8 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 e48eb19..ed46dc7 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 9713d57..b390ba2 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 668b7e9..98ecc03 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 ea96a08..159c589 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 49c90ea..976c91b 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 b7db290..9d6fc6b 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 d100891..fa963fc 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 4501306..e230d90 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 60c9624..eba41f2 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 4630f27..45909d5 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 68124b3..0dbd266 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 a55a7b1..5a9c4dd 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 b46e9a5..5244c68 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 b3c737d..a192090 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 dc462fe..6b852e6 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 b89531d..ff8d84f 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 e9194bf..698649d 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 5d45003..2ab51ec 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 f693179..33ddab9 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 3007627..02368a9 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 61e24e5..b02e75d 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 4618923..55de90a 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 34fd537..6929698 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 1357af3..a54f3da 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 b9418d9..73688fc 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 f89a307..da98e23 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 e18dad2..4972fcc 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 5d95133..267c9fc 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