From: Jan Fajerski Date: Tue, 4 Dec 2018 07:33:53 +0000 (+0100) Subject: Revert "ceph-volume tests.util ensure partitions are listed as top-level keys" X-Git-Tag: v14.1.0~646^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c1c32cbc2736d72295f1bd7921c4a3cd2f4727e;p=ceph.git Revert "ceph-volume tests.util ensure partitions are listed as top-level keys" This reverts commit 6dc01772245e557b73551111f7c48cc60aec0893. Signed-off-by: Jan Fajerski --- diff --git a/src/ceph-volume/ceph_volume/tests/util/test_disk.py b/src/ceph-volume/ceph_volume/tests/util/test_disk.py index e40c982d1f7e..3fae20094f64 100644 --- a/src/ceph-volume/ceph_volume/tests/util/test_disk.py +++ b/src/ceph-volume/ceph_volume/tests/util/test_disk.py @@ -267,28 +267,6 @@ class TestGetDevices(object): assert len(result) == 1 assert result == [ceph_data_path] - def test_sda1_partition(self, tmpfile, tmpdir): - block_path, dev_path, mapper_path = self.setup_paths(tmpdir) - block_sda_path = os.path.join(block_path, 'sda') - block_sda1_path = os.path.join(block_sda_path, 'sda1') - block_sda1_holders = os.path.join(block_sda1_path, 'holders') - dev_sda_path = os.path.join(dev_path, 'sda') - dev_sda1_path = os.path.join(dev_path, 'sda1') - os.makedirs(block_sda_path) - os.makedirs(block_sda1_path) - os.makedirs(dev_sda1_path) - os.makedirs(block_sda1_holders) - os.makedirs(dev_sda_path) - tmpfile('size', '1024', directory=block_sda_path) - tmpfile('partition', '1', directory=block_sda1_path) - result = disk.get_devices( - _sys_block_path=block_path, - _dev_path=dev_path, - _mapper_path=mapper_path) - assert dev_sda_path in list(result.keys()) - assert '/dev/sda1' in list(result.keys()) - assert result['/dev/sda1']['holders'] == [] - def test_sda_size(self, tmpfile, tmpdir): block_path, dev_path, mapper_path = self.setup_paths(tmpdir) block_sda_path = os.path.join(block_path, 'sda')