import quincy beta 17.1.0

[ceph.git] / ceph / src / ceph-volume / ceph_volume / tests / util / test_prepare.py

diff --git a/ceph/src/ceph-volume/ceph_volume/tests/util/test_prepare.py b/ceph/src/ceph-volume/ceph_volume/tests/util/test_prepare.py
index 080823307d383ab04eb52b876813e57923e0aa80..d4ebd48c24b9a13f778830e1b5016a40f2368c6e 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/tests/util/test_prepare.py
+++ b/ceph/src/ceph-volume/ceph_volume/tests/util/test_prepare.py
@@ -136,17 +136,10 @@ 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]
 
-    def test_keyring_is_used_luminous(self, fake_call, monkeypatch):
-        monkeypatch.setattr(prepare, '__release__', 'luminous')
-        monkeypatch.setattr(system, 'chown', lambda path: True)
-        prepare.osd_mkfs_filestore(1, 'asdf', keyring='secret')
-        assert '--keyfile' not in fake_call.calls[0]['args'][0]
-
 
 class TestOsdMkfsBluestore(object):
 
@@ -160,12 +153,6 @@ class TestOsdMkfsBluestore(object):
         prepare.osd_mkfs_bluestore(1, 'asdf')
         assert '--keyfile' not in fake_call.calls[0]['args'][0]
 
-    def test_keyring_is_not_added_luminous(self, fake_call, monkeypatch):
-        monkeypatch.setattr(system, 'chown', lambda path: True)
-        prepare.osd_mkfs_bluestore(1, 'asdf')
-        monkeypatch.setattr(prepare, '__release__', 'luminous')
-        assert '--keyfile' not in fake_call.calls[0]['args'][0]
-
     def test_wal_is_added(self, fake_call, monkeypatch):
         monkeypatch.setattr(system, 'chown', lambda path: True)
         prepare.osd_mkfs_bluestore(1, 'asdf', wal='/dev/smm1')