From 55c3ac55dcedaf185c96ad37d799d6f65ff203df Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 17 Feb 2025 12:43:14 +0000 Subject: [PATCH] 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 --- src/ceph-volume/ceph_volume/tests/api/test_lvm.py | 2 +- src/ceph-volume/ceph_volume/tests/conftest.py | 2 +- src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py | 2 +- src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py | 2 +- .../ceph_volume/tests/devices/lvm/test_deactivate.py | 2 +- src/ceph-volume/ceph_volume/tests/devices/lvm/test_listing.py | 2 +- src/ceph-volume/ceph_volume/tests/devices/lvm/test_migrate.py | 2 +- src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py | 2 +- src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py | 2 +- src/ceph-volume/ceph_volume/tests/devices/raw/test_list.py | 2 +- src/ceph-volume/ceph_volume/tests/devices/raw/test_prepare.py | 2 +- .../ceph_volume/tests/devices/simple/test_activate.py | 2 +- src/ceph-volume/ceph_volume/tests/devices/test_zap.py | 2 +- .../ceph_volume/tests/objectstore/test_baseobjectstore.py | 2 +- src/ceph-volume/ceph_volume/tests/objectstore/test_bluestore.py | 2 +- .../ceph_volume/tests/objectstore/test_lvmbluestore.py | 2 +- .../ceph_volume/tests/objectstore/test_rawbluestore.py | 2 +- src/ceph-volume/ceph_volume/tests/test_inventory.py | 2 +- src/ceph-volume/ceph_volume/tests/util/test_arg_validators.py | 2 +- src/ceph-volume/ceph_volume/tests/util/test_device.py | 2 +- src/ceph-volume/ceph_volume/tests/util/test_disk.py | 2 +- src/ceph-volume/ceph_volume/tests/util/test_encryption.py | 2 +- src/ceph-volume/ceph_volume/tests/util/test_prepare.py | 2 +- src/ceph-volume/ceph_volume/tests/util/test_system.py | 2 +- src/ceph-volume/tox.ini | 1 - 25 files changed, 24 insertions(+), 25 deletions(-) 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 22758033cc7a5..6b62eccbbb6d5 100644 --- 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 a32a85389bdef..03b0a6adaae81 100644 --- 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 b44071026ad38..6e2541fda2cbc 100644 --- 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 014d84010a767..0c5f9f0ec6a09 100644 --- 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 044fd35196fdf..20fbc2e4353dd 100644 --- 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 eb881da1636e9..a39eb35a0e684 100644 --- 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 b032dab4eea42..343bc24415ca3 100644 --- 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 70d93b80af6f1..a908b371a7fa7 100644 --- 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 d9b3bdfd23912..a6747f7cca2d0 100644 --- 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 23d2bfdaa2c72..d0d68d61116d4 100644 --- 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 ac0b1c4fb161d..1442761140b2f 100644 --- 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 ae7e52e518b88..baa10b044974d 100644 --- 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 745b58ae55a2e..63bdc9d789513 100644 --- 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 248adf66e9e49..3e1dc7cfa1c00 100644 --- 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 77bb383284eec..57dab86f9ea64 100644 --- 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 094b729f1f810..35dd4b680ee4f 100644 --- 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 138ec828d8b8c..0c51628c129ca 100644 --- 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 29cd1fc4e4dbf..9bb7776c175d6 100644 --- 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 abbf1d57f332f..7d99e08b83c7b 100644 --- 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 2f6ba174b644e..cb145d10f2c0c 100644 --- 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 8dbb51bd08b49..c103ddb5a6280 100644 --- 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 c155df691a6ae..3e5284d9af8e8 100644 --- 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 d1f53bdddc78c..854eab707660e 100644 --- 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 d599271035b3a..ec5c086b58206 100644 --- 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 f7d294a9aadc9..9325add2a92ef 100644 --- 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 -- 2.39.5