update ceph source to reef 18.2.0

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

diff --git a/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py b/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py
index d27134d5341886138a22dc582eebba566781dc96..75073c51aca258b73dd403220eca78ffdaa55fc2 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py
+++ b/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py
@@ -150,14 +150,13 @@ class TestBatch(object):
         devices = [device1, device2, device3]
         args = factory(report=True,
                        devices=devices,
-                       filestore=False,
                       )
         b = batch.Batch([])
         b.args = args
         b._sort_rotational_disks()
         assert len(b.args.devices) == 3
 
-    @pytest.mark.parametrize('objectstore', ['bluestore', 'filestore'])
+    @pytest.mark.parametrize('objectstore', ['bluestore'])
     def test_batch_sort_mixed(self, factory, objectstore):
         device1 = factory(used_by_ceph=False, available=True, rotational=1, abspath="/dev/sda")
         device2 = factory(used_by_ceph=False, available=True, rotational=1, abspath="/dev/sdb")
@@ -165,16 +164,12 @@ class TestBatch(object):
         devices = [device1, device2, device3]
         args = factory(report=True,
                        devices=devices,
-                       filestore=False if objectstore == 'bluestore' else True,
                       )
         b = batch.Batch([])
         b.args = args
         b._sort_rotational_disks()
         assert len(b.args.devices) == 2
-        if objectstore == 'bluestore':
-            assert len(b.args.db_devices) == 1
-        else:
-            assert len(b.args.journal_devices) == 1
+        assert len(b.args.db_devices) == 1
 
     def test_get_physical_osds_return_len(self, factory,
                                           mock_devices_available,