- Use unittest.mock instead external mock

tests/test_arch.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import unittest
 
 from pungi.arch import (

tests/test_arguments.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_checks.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_compose.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_config.py

@@ -7,7 +7,7 @@ except ImportError:
     import unittest
 
 import six
-import mock
+from unittest import mock
 
 from pungi import checks
 from tests.helpers import load_config, PKGSET_REPOS

tests/test_config_validate_script.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 import os
 import six
 

tests/test_createiso_phase.py

@@ -2,7 +2,7 @@
 
 
 import logging
-import mock
+from unittest import mock
 import six
 
 import os

tests/test_createiso_script.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 from six.moves import StringIO

tests/test_createrepophase.py

@@ -8,7 +8,7 @@ except ImportError:
 import glob
 import os
 
-import mock
+from unittest import mock
 import six
 
 from pungi.module_util import Modulemd

tests/test_extra_files_phase.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 from productmd.extra_files import ExtraFiles

tests/test_gather_method_deps.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 from pungi.phases.gather.methods import method_deps as deps
 from tests import helpers

tests/test_gather_method_hybrid.py

@@ -2,7 +2,7 @@
 
 from collections import namedtuple
 import copy
-import mock
+from unittest import mock
 import os
 
 import six

tests/test_gather_method_nodeps.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 import six

tests/test_gather_phase.py

@@ -4,7 +4,7 @@ import copy
 import json
 import os
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_gather_source_module.py

@@ -5,7 +5,7 @@ try:
 except ImportError:
     import unittest
 
-import mock
+from unittest import mock
 import six
 
 from pungi.phases.gather.sources.source_module import GatherSourceModule

tests/test_image_container_phase.py

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

tests/test_imagebuildphase.py

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

tests/test_imagechecksumphase.py

@@ -4,7 +4,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 import os
 import tempfile

tests/test_initphase.py

@@ -5,7 +5,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 import six
 

tests/test_iso_wrapper.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import itertools
-import mock
+from unittest import mock
 import os
 import six
 

tests/test_koji_wrapper.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import json
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_linker.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 import errno
 import os
 import stat

tests/test_liveimagesphase.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 
 import six
 

tests/test_livemediaphase.py

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

tests/test_media_split.py

@@ -4,7 +4,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 from pungi import media_split
 

tests/test_metadata.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import os
 
 import six

tests/test_notifier.py

@@ -2,7 +2,7 @@
 
 from datetime import datetime
 import json
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_orchestrator.py

@@ -9,7 +9,7 @@ import shutil
 import subprocess
 from textwrap import dedent
 
-import mock
+from unittest import mock
 import six
 from six.moves import configparser
 

tests/test_osbs_phase.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import json
 
 import copy

tests/test_osbuild_phase.py

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

tests/test_ostree_installer_phase.py

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

tests/test_ostree_phase.py

@@ -2,7 +2,7 @@
 
 
 import json
-import mock
+from unittest import mock
 
 import os
 

tests/test_ostree_script.py

@@ -4,7 +4,7 @@
 import json
 import os
 
-import mock
+from unittest import mock
 import six
 import yaml
 

tests/test_ostree_utils.py

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

tests/test_patch_iso.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 try:

tests/test_phase_base.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_pkgset_common.py

@@ -2,7 +2,7 @@
 
 import os
 
-import mock
+from unittest import mock
 import six
 
 from pungi.module_util import Modulemd

tests/test_pkgset_pkgsets.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import ddt
-import mock
+from unittest import mock
 import os
 import six
 

tests/test_repoclosure_phase.py

@@ -6,7 +6,7 @@ try:
 except ImportError:
     import unittest
 
-import mock
+from unittest import mock
 import six
 
 import pungi.phases.repoclosure as repoclosure_phase

tests/test_runroot.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 from pungi.runroot import Runroot

tests/test_scm.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_test_phase.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 import pungi.phases.test as test_phase

tests/test_unified_isos.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 import shutil
 import six

tests/test_util.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import argparse
-import mock
+from unittest import mock
 import os
 
 try: