From 2dab9b20fab659165703e70706923d1ed57011dd Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Fri, 22 Nov 2019 16:57:11 +0100 Subject: [PATCH] ceph-volume: import mock.mock instead of unittest.mock (py2) Fixes: bb4de1a3fc238eaf9f717dc59c6bdf338ef6d657 Fixes: https://tracker.ceph.com/issues/42970 Signed-off-by: Jan Fajerski (cherry picked from commit c1bd09f2591d983f1988e3dadcf3c65c59afb15d) Conflicts: src/ceph-volume/ceph_volume/tests/api/test_lvm.py --- src/ceph-volume/ceph_volume/tests/api/test_lvm.py | 1 + 1 file changed, 1 insertion(+) 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 223ac501382f9..bcfce796a9da4 100644 --- a/src/ceph-volume/ceph_volume/tests/api/test_lvm.py +++ b/src/ceph-volume/ceph_volume/tests/api/test_lvm.py @@ -1,5 +1,6 @@ import os import pytest +from mock.mock import patch from ceph_volume import process, exceptions from ceph_volume.api import lvm as api -- 2.39.5