import 15.2.5

[ceph.git] / ceph / src / ceph-volume / ceph_volume / tests / devices / lvm / strategies / test_filestore.py

diff --git a/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_filestore.py b/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_filestore.py
index 5bfc07086b4c3f264701fcc4fb9b376943283d27..4fd94f5b7dee07e619a827d06c52e44610e79a9c 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_filestore.py
+++ b/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_filestore.py
@@ -118,7 +118,7 @@ class TestSingleType(object):
 
 class TestMixedType(object):
 
-    def test_minimum_size_is_not_met(self, stub_vgs, fakedevice, factory, conf_ceph):
+    def test_minimum_size_is_not_met(self, fakedevice, factory, conf_ceph):
         conf_ceph(get_safe=lambda *a: '120')
         args = factory(filtered_devices=[], osds_per_device=1,
                        journal_size=None, osd_ids=[])
@@ -131,7 +131,7 @@ class TestMixedType(object):
         msg = "journal sizes must be larger than 2GB, detected: 120.00 MB"
         assert msg in str(error.value)
 
-    def test_ssd_device_is_not_large_enough(self, stub_vgs, fakedevice, factory, conf_ceph):
+    def test_ssd_device_is_not_large_enough(self, fakedevice, factory, conf_ceph):
         conf_ceph(get_safe=lambda *a: '7120')
         args = factory(filtered_devices=[], osds_per_device=1,
                        journal_size=None, osd_ids=[])
@@ -144,7 +144,7 @@ class TestMixedType(object):
         msg = "Not enough space in fast devices (5.66 GB) to create 1 x 6.95 GB journal LV"
         assert msg in str(error.value)
 
-    def test_hdd_device_is_lvm_member_fails(self, stub_vgs, fakedevice, factory, conf_ceph):
+    def test_hdd_device_is_lvm_member_fails(self, fakedevice, factory, conf_ceph):
         conf_ceph(get_safe=lambda *a: '5120')
         args = factory(filtered_devices=[], osds_per_device=1,
                        journal_size=None, osd_ids=[])
@@ -159,7 +159,6 @@ class TestMixedType(object):
     @patch('ceph_volume.devices.lvm.strategies.strategies.MixedStrategy.get_common_vg')
     def test_ssd_is_lvm_member_doesnt_fail(self,
                                            patched_get_common_vg,
-                                           volumes,
                                            fakedevice,
                                            factory,
                                            conf_ceph):
@@ -178,13 +177,15 @@ class TestMixedType(object):
         args = factory(filtered_devices=[], osds_per_device=1,
                        journal_size=None, osd_ids=[])
         devices = [ssd, hdd]
-        result = filestore.MixedType.with_auto_devices(args, devices).computed['osds'][0]
+
+        result = filestore.MixedType.with_auto_devices(args, devices).\
+            computed['osds'][0]
         assert result['journal']['path'] == 'vg: fast'
         assert result['journal']['percentage'] == 71
         assert result['journal']['human_readable_size'] == '5.00 GB'
 
     @patch('ceph_volume.api.lvm.get_device_vgs')
-    def test_no_common_vg(self, patched_get_device_vgs, volumes, fakedevice, factory, conf_ceph):
+    def test_no_common_vg(self, patched_get_device_vgs, fakedevice, factory, conf_ceph):
         patched_get_device_vgs.side_effect = lambda x: [lvm.VolumeGroup(vg_name='{}'.format(x[-1]), vg_tags='')]
         ssd1 = fakedevice(
             used_by_ceph=False, is_lvm_member=True, rotational=False, sys_api=dict(size=6073740000)
@@ -195,14 +196,15 @@ class TestMixedType(object):
         hdd = fakedevice(used_by_ceph=False, is_lvm_member=False, rotational=True, sys_api=dict(size=6073740000))
 
         conf_ceph(get_safe=lambda *a: '5120')
-        args = factory(filtered_devices=[], osds_per_device=1,
-                       journal_size=None, osd_ids=[])
+        args = factory(filtered_devices=[], osds_per_device=1, osd_ids=[],
+                       journal_size=None)
         devices = [ssd1, ssd2, hdd]
+
         with pytest.raises(RuntimeError) as error:
             filestore.MixedType.with_auto_devices(args, devices)
             assert 'Could not find a common VG between devices' in str(error.value)
 
-    def test_ssd_device_fails_multiple_osds(self, stub_vgs, fakedevice, factory, conf_ceph):
+    def test_ssd_device_fails_multiple_osds(self, fakedevice, factory, conf_ceph):
         conf_ceph(get_safe=lambda *a: '15120')
         args = factory(filtered_devices=[], osds_per_device=2,
                        journal_size=None, osd_ids=[])