update ceph source to reef 18.2.0

[ceph.git] / ceph / src / ceph-volume / ceph_volume / tests / devices / lvm / test_create.py

diff --git a/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_create.py b/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_create.py
index 1665d76c3884a139ffbae06b3f5ebbab8889c4d6..f91fd7072d0fd4d2bfd5c64b8f64e0b553d5d0eb 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_create.py
+++ b/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_create.py
@@ -1,6 +1,5 @@
 import pytest
 from ceph_volume.devices import lvm
-from mock import patch
 
 
 class TestCreate(object):
@@ -14,39 +13,6 @@ class TestCreate(object):
         with pytest.raises(SystemExit):
             lvm.create.Create(argv=['--help']).main()
         stdout, stderr = capsys.readouterr()
-        assert 'Use the filestore objectstore' in stdout
         assert 'Use the bluestore objectstore' in stdout
         assert 'A physical device or logical' in stdout
 
-    @patch('ceph_volume.util.disk.has_bluestore_label', return_value=False)
-    def test_excludes_filestore_bluestore_flags(self, m_has_bs_label, fake_call, capsys, device_info):
-        device_info()
-        with pytest.raises(SystemExit):
-            lvm.create.Create(argv=['--data', '/dev/sdfoo', '--filestore', '--bluestore']).main()
-        stdout, stderr = capsys.readouterr()
-        expected = 'Cannot use --filestore (filestore) with --bluestore (bluestore)'
-        assert expected in stderr
-
-    @patch('ceph_volume.util.disk.has_bluestore_label', return_value=False)
-    def test_excludes_other_filestore_bluestore_flags(self, m_has_bs_label, fake_call, capsys, device_info):
-        device_info()
-        with pytest.raises(SystemExit):
-            lvm.create.Create(argv=[
-                '--bluestore', '--data', '/dev/sdfoo',
-                '--journal', '/dev/sf14',
-            ]).main()
-        stdout, stderr = capsys.readouterr()
-        expected = 'Cannot use --bluestore (bluestore) with --journal (filestore)'
-        assert expected in stderr
-
-    @patch('ceph_volume.util.disk.has_bluestore_label', return_value=False)
-    def test_excludes_block_and_journal_flags(self, m_has_bs_label, fake_call, capsys, device_info):
-        device_info()
-        with pytest.raises(SystemExit):
-            lvm.create.Create(argv=[
-                '--bluestore', '--data', '/dev/sdfoo', '--block.db', 'vg/ceph1',
-                '--journal', '/dev/sf14',
-            ]).main()
-        stdout, stderr = capsys.readouterr()
-        expected = 'Cannot use --block.db (bluestore) with --journal (filestore)'
-        assert expected in stderr