Use unittest.mock from core python everywhere

mock was an independent module that has been merged into the Python standard library.

test/unit/api_helper_test.py

@@ -1,5 +1,5 @@
 from pytest import raises
-from mock import patch
+from unittest.mock import patch
 from kiwi.api_helper import (
     obsolete,
     decommissioned

test/unit/archive/cpio_test.py

@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.archive.cpio import ArchiveCpio
 

test/unit/archive/tar_test.py

@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 
 from kiwi.archive.tar import ArchiveTar
 

test/unit/boot/image/base_test.py

@@ -1,6 +1,6 @@
 import io
 from collections import namedtuple
-from mock import (
+from unittest.mock import (
     patch, Mock, MagicMock
 )
 from pytest import raises

test/unit/boot/image/builtin_kiwi_test.py

@@ -1,5 +1,5 @@
 import sys
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from pytest import raises

test/unit/boot/image/dracut_test.py

@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from collections import namedtuple

test/unit/boot/image/init_test.py

@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     Mock, patch
 )
 from pytest import raises

test/unit/bootloader/config/base_test.py

@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, call, Mock, MagicMock
 )
 from pytest import (

test/unit/bootloader/config/bootloader_spec_base_test.py

@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import (

test/unit/bootloader/config/custom_test.py

@@ -16,7 +16,7 @@
 # along with kiwi.  If not, see <http://www.gnu.org/licenses/>
 #
 from pytest import raises
-from mock import Mock
+from unittest.mock import Mock
 
 from kiwi.bootloader.config.custom import BootLoaderConfigCustom
 

test/unit/bootloader/config/grub2_test.py

@@ -2,7 +2,7 @@
 import os
 import logging
 from collections import namedtuple
-from mock import (
+from unittest.mock import (
     patch, call, MagicMock, Mock
 )
 from pytest import (

test/unit/bootloader/config/init_test.py

@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises

test/unit/bootloader/config/systemd_boot_test.py

@@ -1,6 +1,6 @@
 import io
 from pytest import raises
-from mock import (
+from unittest.mock import (
     Mock, patch, call, MagicMock
 )
 from kiwi.bootloader.config.systemd_boot import BootLoaderSystemdBoot

test/unit/bootloader/install/base_test.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from pytest import raises
 
 from kiwi.bootloader.install.base import BootLoaderInstallBase

test/unit/bootloader/install/grub2_test.py

@@ -1,9 +1,9 @@
 import io
-from mock import (
+from unittest.mock import (
     patch, call, MagicMock
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 
 from kiwi.bootloader.install.grub2 import BootLoaderInstallGrub2
 from kiwi.defaults import Defaults

test/unit/bootloader/install/init_test.py

@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises

test/unit/bootloader/install/systemd_boot_test.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from pytest import raises
 
 from kiwi.bootloader.install.systemd_boot import BootLoaderInstallSystemdBoot

test/unit/builder/archive_test.py

@@ -1,7 +1,7 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 import sys
-import mock
+import unittest.mock as mock
 import kiwi
 
 from ..test_helper import argv_kiwi_tests

test/unit/builder/container_test.py

@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call, mock_open
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 import kiwi
 
 from kiwi.defaults import Defaults

test/unit/builder/disk_test.py

@@ -1,6 +1,6 @@
 import logging
 import sys
-from mock import (
+from unittest.mock import (
     call, patch, mock_open, Mock, MagicMock, ANY
 )
 from pytest import (

test/unit/builder/filesystem_test.py

@@ -1,5 +1,5 @@
 import sys
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises

test/unit/builder/init_test.py

@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises

test/unit/builder/install_test.py

@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     MagicMock, patch, call, mock_open, ANY, Mock
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 import kiwi.builder.install
 
 from collections import namedtuple

test/unit/builder/kis_test.py

@@ -1,6 +1,6 @@
 import logging
 from collections import namedtuple
-from mock import (
+from unittest.mock import (
     patch, Mock, MagicMock, mock_open
 )
 from pytest import (

test/unit/builder/live_test.py

@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     MagicMock, patch, call, Mock
 )
 from pytest import raises, mark

test/unit/cli_test.py

@@ -1,6 +1,6 @@
 import sys
 import logging
-from mock import patch
+from unittest.mock import patch
 from pytest import (
     raises, fixture
 )

test/unit/command_process_test.py

@@ -1,6 +1,6 @@
-import mock
+import unittest.mock as mock
 import logging
-from mock import patch
+from unittest.mock import patch
 from pytest import (
     raises, fixture
 )

test/unit/command_test.py

@@ -1,7 +1,7 @@
-from mock import patch
+from unittest.mock import patch
 from collections import namedtuple
 from pytest import raises
-import mock
+import unittest.mock as mock
 import os
 
 from kiwi.command import Command

test/unit/container/appx_test.py

@@ -1,6 +1,6 @@
 import io
 from pytest import raises
-from mock import (
+from unittest.mock import (
     patch, Mock, MagicMock, call
 )
 

test/unit/container/init_test.py

@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from kiwi.container import ContainerImage

test/unit/container/oci_test.py

@@ -1,6 +1,6 @@
 import logging
 from pytest import fixture
-from mock import (
+from unittest.mock import (
     patch, mock_open, Mock
 )
 

test/unit/container/setup/appx_test.py

@@ -1,6 +1,6 @@
 import io
 from pytest import raises
-from mock import (
+from unittest.mock import (
     patch, MagicMock
 )
 

test/unit/container/setup/base_test.py

@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, call, mock_open
 )
 from pytest import raises

test/unit/container/setup/docker_test.py

@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.container.setup.docker import ContainerSetupDocker
 

test/unit/container/setup/init_test.py

@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from kiwi.container.setup import ContainerSetup

test/unit/container/setup/oci_test.py

@@ -1,6 +1,6 @@
-from mock import patch
-from mock import call
-import mock
+from unittest.mock import patch
+from unittest.mock import call
+import unittest.mock as mock
 
 from kiwi.container.setup.oci import ContainerSetupOCI
 

test/unit/defaults_test.py

@@ -1,8 +1,8 @@
 import logging
-from mock import patch
+from unittest.mock import patch
 
 import sys
-from mock import MagicMock
+from unittest.mock import MagicMock
 from pytest import fixture
 
 from .test_helper import argv_kiwi_tests

test/unit/filesystem/base_test.py

@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import (

test/unit/filesystem/btrfs_test.py

@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.btrfs import FileSystemBtrfs
 

test/unit/filesystem/ext2_test.py

@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.ext2 import FileSystemExt2
 

test/unit/filesystem/ext3_test.py

@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.ext3 import FileSystemExt3
 

test/unit/filesystem/ext4_test.py

@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.ext4 import FileSystemExt4
 

test/unit/filesystem/fat16_test.py

@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.fat16 import FileSystemFat16
 

test/unit/filesystem/fat32_test.py

@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.fat32 import FileSystemFat32
 

test/unit/filesystem/init_test.py

@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
-from mock import Mock
+from unittest.mock import Mock
 
 from kiwi.filesystem import FileSystem
 

test/unit/filesystem/isofs_test.py

@@ -1,7 +1,7 @@
 import logging
 from pytest import fixture
-from mock import patch
-import mock
+from unittest.mock import patch
+import unittest.mock as mock
 
 from kiwi.filesystem.isofs import FileSystemIsoFs
 

test/unit/filesystem/setup_test.py

@@ -1,7 +1,7 @@
 import logging
-from mock import patch
+from unittest.mock import patch
 from pytest import fixture
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.setup import FileSystemSetup
 

test/unit/filesystem/squashfs_test.py

@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from kiwi.defaults import Defaults
 from kiwi.filesystem.squashfs import FileSystemSquashFs