unittest: use unittest.mock instead of mock

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

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
 

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

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

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

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
 

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
 

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

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

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

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

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

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

tests/test_lib/test_repowatcher.py

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

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

tests/test_lib/test_savepoint.py

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

tests/test_lib/test_tasks.py

@@ -1,16 +1,20 @@
 from __future__ import absolute_import
-import mock
+
 import os
-import random
+from os import path, makedirs
+import tempfile
+import unittest
+try:
+    from unittest import mock
+    from unittest.mock import patch, MagicMock, Mock, call
+except ImportError:
+    import mock
+    from mock import patch, MagicMock, Mock, call
+
+import requests_mock
 import shutil
 import six
 from six.moves import range
-import tempfile
-import unittest
-
-from os import path, makedirs
-from mock import patch, MagicMock, Mock, call
-import requests_mock
 
 import koji
 from koji.tasks import BaseTaskHandler, FakeTask, ForkTask, SleepTask, WaitTestTask, scan_mounts, \

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

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):