From: Alfredo Deza Date: Wed, 7 Mar 2018 16:57:32 +0000 (-0500) Subject: ceph-volume tests verify that mkfs filestore uses default flags X-Git-Tag: v13.0.2~29^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20787%2Fhead;p=ceph.git ceph-volume tests verify that mkfs filestore uses default flags Signed-off-by: Alfredo Deza --- diff --git a/src/ceph-volume/ceph_volume/tests/util/test_prepare.py b/src/ceph-volume/ceph_volume/tests/util/test_prepare.py index c65e51f6b5d6..5cc8da932671 100644 --- a/src/ceph-volume/ceph_volume/tests/util/test_prepare.py +++ b/src/ceph-volume/ceph_volume/tests/util/test_prepare.py @@ -116,6 +116,31 @@ class TestFormatDevice(object): assert expected == fake_run.calls[0]['args'][0] +mkfs_filestore_flags = [ + 'ceph-osd', + '--cluster', + '--osd-objectstore', 'filestore', + '--mkfs', + '-i', + '--monmap', + '--keyfile', '-', # goes through stdin + '--osd-data', + '--osd-journal', + '--osd-uuid', + '--setuser', 'ceph', + '--setgroup', 'ceph' +] + + +class TestOsdMkfsFilestore(object): + + @pytest.mark.parametrize('flag', mkfs_filestore_flags) + def test_keyring_is_used(self, fake_call, monkeypatch, flag): + monkeypatch.setattr(system, 'chown', lambda path: True) + prepare.osd_mkfs_filestore(1, 'asdf', keyring='secret') + assert flag in fake_call.calls[0]['args'][0] + + class TestOsdMkfsBluestore(object): def test_keyring_is_added(self, fake_call, monkeypatch):