Skip to content

Commit 55c3ac5

Browse files
committed
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 <[email protected]>
1 parent 140199b commit 55c3ac5

25 files changed

+24
-25
lines changed

src/ceph-volume/ceph_volume/tests/api/test_lvm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22
import pytest
3-
from mock.mock import patch
3+
from unittest.mock import patch
44
from ceph_volume import process, exceptions
55
from ceph_volume.api import lvm as api
66

src/ceph-volume/ceph_volume/tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import pytest
33
import argparse
4-
from mock.mock import patch, PropertyMock, create_autospec, Mock, MagicMock
4+
from unittest.mock import patch, PropertyMock, create_autospec, Mock, MagicMock
55
from ceph_volume.api import lvm
66
from ceph_volume.util import disk
77
from ceph_volume.util import device

src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from ceph_volume.tests.conftest import Capture
66
from ceph_volume import objectstore
77
#from ceph_volume.util.prepare import create_key
8-
from mock import patch, call
8+
from unittest.mock import patch, call
99
from argparse import Namespace
1010

1111
class Args(object):

src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import random
44

55
from argparse import ArgumentError, Namespace
6-
from mock import MagicMock, patch
6+
from unittest.mock import MagicMock, patch
77

88
from ceph_volume.devices.lvm import batch
99
from ceph_volume.util import arg_validators, disk, device

src/ceph-volume/ceph_volume/tests/devices/lvm/test_deactivate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import pytest
2-
from mock.mock import patch
2+
from unittest.mock import patch
33
from ceph_volume.api import lvm
44
from ceph_volume.devices.lvm import deactivate
55

src/ceph-volume/ceph_volume/tests/devices/lvm/test_listing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22
from ceph_volume.devices import lvm
33
from ceph_volume.api import lvm as api
4-
from mock import patch, Mock
4+
from unittest.mock import patch, Mock
55

66
# TODO: add tests for following commands -
77
# ceph-volume list

src/ceph-volume/ceph_volume/tests/devices/lvm/test_migrate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import pytest
2-
from mock.mock import patch, Mock
2+
from unittest.mock import patch, Mock
33
from ceph_volume import process
44
from ceph_volume.api import lvm as api
55
from ceph_volume.devices.lvm import migrate

src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22
from ceph_volume.devices import lvm
33
from ceph_volume.api import lvm as api
4-
from mock.mock import patch
4+
from unittest.mock import patch
55
from ceph_volume import objectstore
66

77

src/ceph-volume/ceph_volume/tests/devices/lvm/test_zap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33
import pytest
44
from copy import deepcopy
5-
from mock.mock import patch, call, Mock
5+
from unittest.mock import patch, call, Mock
66
from ceph_volume import process
77
from ceph_volume.api import lvm as api
88
from ceph_volume.devices.lvm import zap

src/ceph-volume/ceph_volume/tests/devices/raw/test_list.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# type: ignore
22
import pytest
33
from .data_list import ceph_bluestore_tool_show_label_output
4-
from mock.mock import patch, Mock
4+
from unittest.mock import patch, Mock
55
from ceph_volume.devices import raw
66

77
# Sample lsblk output is below that overviews the test scenario. (--json output for reader clarity)

0 commit comments

Comments
 (0)