From: Alfredo Deza Date: Thu, 2 Aug 2018 17:51:22 +0000 (-0400) Subject: ceph-volume tests patch __release__ to mimic always for stdin keys X-Git-Tag: v12.2.8~67^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c12459c46a6b5a1cb46c1f0f6ff4ef4969c1d0f1;p=ceph.git ceph-volume tests patch __release__ to mimic always for stdin keys Signed-off-by: Alfredo Deza (cherry picked from commit 99c17ecbaf443824ea8e155e06c11b20a8603d76) --- 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 e41ddfe59b9..a6a9ddad3a5 100644 --- a/src/ceph-volume/ceph_volume/tests/util/test_prepare.py +++ b/src/ceph-volume/ceph_volume/tests/util/test_prepare.py @@ -145,6 +145,7 @@ class TestOsdMkfsFilestore(object): @pytest.mark.parametrize('flag', mkfs_filestore_flags) def test_keyring_is_used(self, fake_call, monkeypatch, flag): + monkeypatch.setattr(prepare, '__release__', 'mimic') monkeypatch.setattr(system, 'chown', lambda path: True) prepare.osd_mkfs_filestore(1, 'asdf', keyring='secret') assert flag in fake_call.calls[0]['args'][0]