]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: import mock.mock instead of unittest.mock (py2) 32871/head
authorJan Fajerski <jfajerski@suse.com>
Fri, 22 Nov 2019 15:57:11 +0000 (16:57 +0100)
committerShyukri Shyukriev <shshyukriev@suse.com>
Sat, 25 Jan 2020 21:03:04 +0000 (23:03 +0200)
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

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

index 223ac501382f99641260ccf79bed5f133c8f8000..bcfce796a9da4fd750c1091d546fefe54e5e9fd3 100644 (file)
@@ -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