ceph-volume: migrate unit tests from 'mock' to 'unittest.mock'

unit tests in ceph-volume was still using the external 'mock' library
for unit tests, which is unnecessary since 'unittest.mock' is part
of the Python standard library (available since Python 3.3).
This commit updates all imports to use 'unittest.mock' instead,
ensuring better maintainability and removing the need for an extra
dependency.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>

diff --git a/src/ceph-volume/ceph_volume/tests/api/test_lvm.py b/src/ceph-volume/ceph_volume/tests/api/test_lvm.py
index 22758033cc7a56feed27c592d146281b77ef6a86..6b62eccbbb6d55b0319f4f0e94cb46f43b3689d6 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/api/test_lvm.py
+++ b/src/ceph-volume/ceph_volume/tests/api/test_lvm.py
@@ -1,6 +1,6 @@
 import os
 import pytest
-from mock.mock import patch
+from unittest.mock import patch
 from ceph_volume import process, exceptions
 from ceph_volume.api import lvm as api
 

diff --git a/src/ceph-volume/ceph_volume/tests/conftest.py b/src/ceph-volume/ceph_volume/tests/conftest.py
index a32a85389bdeff1fa1ff8e9addb99ced17dacbcf..03b0a6adaae8125020fb17ebb82e001cabd225fe 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/conftest.py
+++ b/src/ceph-volume/ceph_volume/tests/conftest.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 import argparse
-from mock.mock import patch, PropertyMock, create_autospec, Mock, MagicMock
+from unittest.mock import patch, PropertyMock, create_autospec, Mock, MagicMock
 from ceph_volume.api import lvm
 from ceph_volume.util import disk
 from ceph_volume.util import device

diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py
index b44071026ad38b09ca3f69cbfad818d73a983db4..6e2541fda2cbcffff89f114863f18cf91281d163 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py
@@ -5,7 +5,7 @@ from ceph_volume.api import lvm as api
 from ceph_volume.tests.conftest import Capture
 from ceph_volume import objectstore
 #from ceph_volume.util.prepare import create_key
-from mock import patch, call
+from unittest.mock import patch, call
 from argparse import Namespace
 
 class Args(object):

diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py
index 014d84010a767ce88177bcf9fb88d1e518ede354..0c5f9f0ec6a091bb6d647497e8c9a97946c25487 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py
@@ -3,7 +3,7 @@ import json
 import random
 
 from argparse import ArgumentError, Namespace
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from ceph_volume.devices.lvm import batch
 from ceph_volume.util import arg_validators, disk, device

diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_deactivate.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_deactivate.py
index 044fd35196fdf716f0e7ac530716b3a0f48dd5ad..20fbc2e4353dd19accd92c154ff72bb85618ff9b 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_deactivate.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_deactivate.py
@@ -1,5 +1,5 @@
 import pytest
-from mock.mock import patch
+from unittest.mock import patch
 from ceph_volume.api import lvm
 from ceph_volume.devices.lvm import deactivate
 

diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_listing.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_listing.py
index eb881da1636e949bf48fbd8753b871259462a420..a39eb35a0e684ed09df660bf1a8b3bf29341f043 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_listing.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_listing.py
@@ -1,7 +1,7 @@
 import pytest
 from ceph_volume.devices import lvm
 from ceph_volume.api import lvm as api
-from mock import patch, Mock
+from unittest.mock import patch, Mock
 
 # TODO: add tests for following commands -
 # ceph-volume list

diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_migrate.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_migrate.py
index b032dab4eea429cf8345c1e062909986e4645859..343bc24415ca3a0eacd4cf3cd859abb4b891b1ce 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_migrate.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_migrate.py
@@ -1,5 +1,5 @@
 import pytest
-from mock.mock import patch, Mock
+from unittest.mock import patch, Mock
 from ceph_volume import process
 from ceph_volume.api import lvm as api
 from ceph_volume.devices.lvm import migrate

diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py
index 70d93b80af6f12f91117e4092db27201fce2726f..a908b371a7fa7af0bb1cde5cc14978e2b7b8aa98 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py
@@ -1,7 +1,7 @@
 import pytest
 from ceph_volume.devices import lvm
 from ceph_volume.api import lvm as api
-from mock.mock import patch
+from unittest.mock import patch
 from ceph_volume import objectstore
 
 

diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py
index d9b3bdfd239128846d06fe038d0d7ab418fee7f3..a6747f7cca2d0aef848039e9291d8473ef21ab7a 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py
@@ -2,7 +2,7 @@
 import os
 import pytest
 from copy import deepcopy
-from mock.mock import patch, call, Mock
+from unittest.mock import patch, call, Mock
 from ceph_volume import process
 from ceph_volume.api import lvm as api
 from ceph_volume.devices.lvm import zap

diff --git a/src/ceph-volume/ceph_volume/tests/devices/raw/test_list.py b/src/ceph-volume/ceph_volume/tests/devices/raw/test_list.py
index 23d2bfdaa2c723df0c5d71cbccece4c5aca26146..d0d68d61116d479d464143aa86167c94ea9e254e 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/raw/test_list.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/raw/test_list.py
@@ -1,7 +1,7 @@
 # type: ignore
 import pytest
 from .data_list import ceph_bluestore_tool_show_label_output
-from mock.mock import patch, Mock
+from unittest.mock import patch, Mock
 from ceph_volume.devices import raw
 
 # Sample lsblk output is below that overviews the test scenario. (--json output for reader clarity)

diff --git a/src/ceph-volume/ceph_volume/tests/devices/raw/test_prepare.py b/src/ceph-volume/ceph_volume/tests/devices/raw/test_prepare.py
index ac0b1c4fb161d84601cd48cc068ce23a62988d33..1442761140b2f0509d4fb0a1dfd37f2260e00c5c 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/raw/test_prepare.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/raw/test_prepare.py
@@ -1,6 +1,6 @@
 import pytest
 from ceph_volume.devices import raw
-from mock.mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 from ceph_volume import objectstore
 
 class TestRaw(object):

diff --git a/src/ceph-volume/ceph_volume/tests/devices/simple/test_activate.py b/src/ceph-volume/ceph_volume/tests/devices/simple/test_activate.py
index ae7e52e518b888ef10041c94d8c61a54659289a9..baa10b044974d23b471e8e9e5d2da53b18085e9c 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/simple/test_activate.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/simple/test_activate.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 from ceph_volume.devices.simple import activate
-from mock.mock import patch
+from unittest.mock import patch
 
 
 class TestActivate(object):

diff --git a/src/ceph-volume/ceph_volume/tests/devices/test_zap.py b/src/ceph-volume/ceph_volume/tests/devices/test_zap.py
index 745b58ae55a2e49ddb7b0a08f3d4b1a955c79166..63bdc9d789513ad402ec094a6c0f34ee4d35a964 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/devices/test_zap.py
+++ b/src/ceph-volume/ceph_volume/tests/devices/test_zap.py
@@ -1,6 +1,6 @@
 import pytest
 from ceph_volume.devices import lvm
-from mock.mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 
 class TestZap(object):

diff --git a/src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py b/src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py
index 248adf66e9e49aa212f9d324a9b4e50bbbce3428..3e1dc7cfa1c00bd2488cf3e977c0e1e0232f4658 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py
+++ b/src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py
@@ -1,5 +1,5 @@
 import pytest
-from mock.mock import patch, Mock, call
+from unittest.mock import patch, Mock, call
 from ceph_volume.objectstore.baseobjectstore import BaseObjectStore
 from ceph_volume.util import system
 

diff --git a/src/ceph-volume/ceph_volume/tests/objectstore/test_bluestore.py b/src/ceph-volume/ceph_volume/tests/objectstore/test_bluestore.py
index 77bb383284eeced7811c01d586feb64fae14cdec..57dab86f9ea64f122d36b4a739934e123382cc85 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/objectstore/test_bluestore.py
+++ b/src/ceph-volume/ceph_volume/tests/objectstore/test_bluestore.py
@@ -1,4 +1,4 @@
-from mock import patch, Mock
+from unittest.mock import patch, Mock
 from ceph_volume.objectstore.bluestore import BlueStore
 
 

diff --git a/src/ceph-volume/ceph_volume/tests/objectstore/test_lvmbluestore.py b/src/ceph-volume/ceph_volume/tests/objectstore/test_lvmbluestore.py
index 094b729f1f810b5f42883bacb75e1522fd8c61f5..35dd4b680ee4f928d389dba11237fb2ea897d7aa 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/objectstore/test_lvmbluestore.py
+++ b/src/ceph-volume/ceph_volume/tests/objectstore/test_lvmbluestore.py
@@ -1,5 +1,5 @@
 import pytest
-from mock import patch, Mock, MagicMock, call
+from unittest.mock import patch, Mock, MagicMock, call
 from ceph_volume.objectstore.lvmbluestore import LvmBlueStore
 from ceph_volume.api.lvm import Volume
 from ceph_volume.util import system

diff --git a/src/ceph-volume/ceph_volume/tests/objectstore/test_rawbluestore.py b/src/ceph-volume/ceph_volume/tests/objectstore/test_rawbluestore.py
index 138ec828d8b8cafa469bc1ba5fd78ed5512f657a..0c51628c129ca1e24543e0f07723eb80077fd311 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/objectstore/test_rawbluestore.py
+++ b/src/ceph-volume/ceph_volume/tests/objectstore/test_rawbluestore.py
@@ -1,5 +1,5 @@
 import pytest
-from mock import patch, Mock, MagicMock, call
+from unittest.mock import patch, Mock, MagicMock, call
 from ceph_volume.objectstore.rawbluestore import RawBlueStore
 from ceph_volume.util import system
 

diff --git a/src/ceph-volume/ceph_volume/tests/test_inventory.py b/src/ceph-volume/ceph_volume/tests/test_inventory.py
index 29cd1fc4e4dbf0a144d1249056a12a606197b068..9bb7776c175d6d16377129e6a53482f447971d87 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/test_inventory.py
+++ b/src/ceph-volume/ceph_volume/tests/test_inventory.py
@@ -3,7 +3,7 @@
 import pytest
 from ceph_volume.util.device import Devices
 from ceph_volume.util.lsmdisk import LSMDisk
-from mock.mock import patch
+from unittest.mock import patch
 import ceph_volume.util.lsmdisk as lsmdisk
 
 

diff --git a/src/ceph-volume/ceph_volume/tests/util/test_arg_validators.py b/src/ceph-volume/ceph_volume/tests/util/test_arg_validators.py
index abbf1d57f332f94b45eb000bd66e24f13c5842cb..7d99e08b83c7b21944ebe5b77d102cfa73069929 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/util/test_arg_validators.py
+++ b/src/ceph-volume/ceph_volume/tests/util/test_arg_validators.py
@@ -2,7 +2,7 @@ import argparse
 import pytest
 from ceph_volume import exceptions, process
 from ceph_volume.util import arg_validators
-from mock.mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 
 class TestOSDPath(object):

diff --git a/src/ceph-volume/ceph_volume/tests/util/test_device.py b/src/ceph-volume/ceph_volume/tests/util/test_device.py
index 2f6ba174b644e12750e414ea6062ce0b9cbce746..cb145d10f2c0ccb24aecd949cbb2e2f80d6e32fa 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/util/test_device.py
+++ b/src/ceph-volume/ceph_volume/tests/util/test_device.py
@@ -4,7 +4,7 @@ import pytest
 from copy import deepcopy
 from ceph_volume.util import device
 from ceph_volume.api import lvm as api
-from mock.mock import patch, mock_open
+from unittest.mock import patch, mock_open
 
 
 class TestDevice(object):

diff --git a/src/ceph-volume/ceph_volume/tests/util/test_disk.py b/src/ceph-volume/ceph_volume/tests/util/test_disk.py
index 8dbb51bd08b494ec8a315cbb5a32c993c8e441ad..c103ddb5a6280b83d28e92c34a38325d82054da2 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/util/test_disk.py
+++ b/src/ceph-volume/ceph_volume/tests/util/test_disk.py
@@ -1,7 +1,7 @@
 import pytest
 import stat
 from ceph_volume.util import disk
-from mock.mock import patch, Mock, MagicMock, mock_open
+from unittest.mock import patch, Mock, MagicMock, mock_open
 from pyfakefs.fake_filesystem_unittest import TestCase
 
 

diff --git a/src/ceph-volume/ceph_volume/tests/util/test_encryption.py b/src/ceph-volume/ceph_volume/tests/util/test_encryption.py
index c155df691a6ae462fcfb8e1b22c64efb90d3f28d..3e5284d9af8e85cb6600a62ab7dd749609f50645 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/util/test_encryption.py
+++ b/src/ceph-volume/ceph_volume/tests/util/test_encryption.py
@@ -1,5 +1,5 @@
 from ceph_volume.util import encryption
-from mock.mock import call, patch, Mock, MagicMock
+from unittest.mock import call, patch, Mock, MagicMock
 from typing import Any
 import base64
 import pytest

diff --git a/src/ceph-volume/ceph_volume/tests/util/test_prepare.py b/src/ceph-volume/ceph_volume/tests/util/test_prepare.py
index d1f53bdddc78c93f3470d190e6c0b3b1ebbac15d..854eab707660ef36aba2b73e1b9d557f859d00e2 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/util/test_prepare.py
+++ b/src/ceph-volume/ceph_volume/tests/util/test_prepare.py
@@ -6,7 +6,7 @@ from ceph_volume.util.prepare import system
 from ceph_volume import conf
 from ceph_volume.tests.conftest import Factory
 from ceph_volume import objectstore
-from mock.mock import patch
+from unittest.mock import patch
 
 
 class TestOSDIDAvailable(object):

diff --git a/src/ceph-volume/ceph_volume/tests/util/test_system.py b/src/ceph-volume/ceph_volume/tests/util/test_system.py
index d599271035b3a66c4cc7acd9c100d7216fa9c0d7..ec5c086b58206b580909c578a2012bccecbd6ce8 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/util/test_system.py
+++ b/src/ceph-volume/ceph_volume/tests/util/test_system.py
@@ -4,7 +4,7 @@ import getpass
 import pytest
 from textwrap import dedent
 from ceph_volume.util import system
-from mock.mock import patch
+from unittest.mock import patch
 from ceph_volume.tests.conftest import Factory
 
 

diff --git a/src/ceph-volume/tox.ini b/src/ceph-volume/tox.ini
index f7d294a9aadc9ded0528f0a672fe2916c5fb8ee3..9325add2a92efef64cfacaa3c6449ae800494b1c 100644 (file)
--- a/src/ceph-volume/tox.ini
+++ b/src/ceph-volume/tox.ini
@@ -6,7 +6,6 @@ skip_missing_interpreters = true
 deps=
   pytest
   pytest-xdist
-  mock
   pyfakefs
 allowlist_externals=
   ./tox_install_command.sh