From: Jan Fajerski <jfajerski@suse.com>
Date: Fri, 22 Nov 2019 15:57:11 +0000 (+0100)
Subject: ceph-volume: import mock.mock instead of unittest.mock (py2)
X-Git-Tag: v13.2.9~98^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32871%2Fhead;p=ceph.git

ceph-volume: import mock.mock instead of unittest.mock (py2)

Fixes: bb4de1a3fc238eaf9f717dc59c6bdf338ef6d657
Fixes: https://tracker.ceph.com/issues/42970

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit c1bd09f2591d983f1988e3dadcf3c65c59afb15d)

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

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 223ac501382f..bcfce796a9da 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