From 0744da952edbdbcaa0a127ec2fdf6d86a09c7701 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 18 Sep 2018 14:07:06 -0400 Subject: [PATCH] ceph-volume tests.lvm verify that it is reported when --journal is not used with --filestore Signed-off-by: Alfredo Deza (cherry picked from commit ae657d2fe012b0e78959ead9d8d3baa1095a31ff) --- .../ceph_volume/tests/devices/lvm/test_prepare.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py index bc2486cf6944f..ab0115e959baf 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py @@ -74,6 +74,13 @@ class TestPrepare(object): expected = 'Cannot use --block.db (bluestore) with --journal (filestore)' assert expected in stdout + def test_journal_is_required_with_filestore(self, is_root, monkeypatch): + monkeypatch.setattr('os.path.exists', lambda x: True) + with pytest.raises(SystemExit) as error: + lvm.prepare.Prepare(argv=['--filestore', '--data', '/dev/sdfoo']).main() + expected = '--journal is required when using --filestore' + assert expected in str(error) + class TestGetJournalLV(object): -- 2.39.5