From 030564e4978bf2b79c8df4dff778e61f28fa5f97 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Thu, 25 Nov 2021 17:38:35 +0100 Subject: [PATCH] python-common/tests: Remove filstore tests in test_disk_selector.py Signed-off-by: Sebastian Wagner (cherry picked from commit 1c40ca1e37e5e798cfd9cf317f39b11dd22ea086) --- .../ceph/tests/test_disk_selector.py | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/python-common/ceph/tests/test_disk_selector.py b/src/python-common/ceph/tests/test_disk_selector.py index 3f154c4d77b0..0b7826c4b069 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' -- 2.47.3