From: Alfredo Deza Date: Wed, 28 Nov 2018 18:53:56 +0000 (-0500) Subject: ceph-volume tests.util ensure partitions are listed as top-level keys X-Git-Tag: v14.1.0~747^2~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6dc01772245e557b73551111f7c48cc60aec0893;p=ceph.git ceph-volume tests.util ensure partitions are listed as top-level keys Signed-off-by: Alfredo Deza --- 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 3fae20094f64..e40c982d1f7e 100644 --- a/src/ceph-volume/ceph_volume/tests/util/test_disk.py +++ b/src/ceph-volume/ceph_volume/tests/util/test_disk.py @@ -267,6 +267,28 @@ 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')