From: Sebastian Wagner <sewagner@redhat.com>
Date: Thu, 25 Nov 2021 16:38:35 +0000 (+0100)
Subject: python-common/tests: Remove filstore tests in test_disk_selector.py
X-Git-Tag: v16.2.8~251^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F44626%2Fhead;p=ceph.git

python-common/tests: Remove filstore tests in test_disk_selector.py

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 1c40ca1e37e5e798cfd9cf317f39b11dd22ea086)
---

diff --git a/src/python-common/ceph/tests/test_disk_selector.py b/src/python-common/ceph/tests/test_disk_selector.py
index 3f154c4d77b..0b7826c4b06 100644
--- a/src/python-common/ceph/tests/test_disk_selector.py
+++ b/src/python-common/ceph/tests/test_disk_selector.py
@@ -344,11 +344,6 @@ class TestDriveGroup(object):
                 }
 
             dgo = DriveGroupSpec.from_json(raw_sample)
-            if disk_format == 'filestore':
-                with pytest.raises(DriveGroupValidationError):
-                    dgo.validate()
-            else:
-                dgo.validate()
             return dgo
 
         return make_sample_data
@@ -424,20 +419,10 @@ class TestDriveGroup(object):
             limit=0,
         )
 
-    def test_journal_device_prop(self, test_fix):
-        test_fix = test_fix(disk_format='filestore')
-        assert test_fix.journal_devices == DeviceSelection(
-            size=':20G'
-        )
-
     def test_wal_device_prop_empty(self, test_fix):
         test_fix = test_fix(empty=True)
         assert test_fix.wal_devices is None
 
-    def test_filestore_format_prop(self, test_fix):
-        test_fix = test_fix(disk_format='filestore')
-        assert test_fix.objectstore == 'filestore'
-
     def test_bluestore_format_prop(self, test_fix):
         test_fix = test_fix(disk_format='bluestore')
         assert test_fix.objectstore == 'bluestore'
@@ -446,10 +431,6 @@ class TestDriveGroup(object):
         test_fix = test_fix(empty=True)
         assert test_fix.objectstore == 'bluestore'
 
-    def test_journal_size(self, test_fix):
-        test_fix = test_fix(disk_format='filestore')
-        assert test_fix.journal_size == '5G'
-
     def test_osds_per_device(self, test_fix):
         test_fix = test_fix(osds_per_device='3')
         assert test_fix.osds_per_device == '3'