]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume tests.util ensure that both disk and device report is_device
authorAlfredo Deza <adeza@redhat.com>
Wed, 28 Nov 2018 21:09:49 +0000 (16:09 -0500)
committerAlfredo Deza <adeza@redhat.com>
Fri, 30 Nov 2018 19:06:37 +0000 (14:06 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit df8ba476d68a62f6e0449aa27c81f3effa1e0536)

src/ceph-volume/ceph_volume/tests/util/test_device.py

index bcddfb4469855bf5a0989e1354f58ab5170496e7..5a5e520d8717b9a22e394c6c38f9396ce3a9ac95 100644 (file)
@@ -36,12 +36,19 @@ class TestDevice(object):
         disk = device.Device("/dev/nvme0n1")
         assert len(disk.vgs) == 1
 
-    def test_is_device(self, device_info):
+    def test_device_is_device(self, device_info, pvolumes):
         data = {"/dev/sda": {"foo": "bar"}}
         lsblk = {"TYPE": "device"}
         device_info(devices=data, lsblk=lsblk)
         disk = device.Device("/dev/sda")
-        assert disk.is_device
+        assert disk.is_device is True
+
+    def test_disk_is_device(self, device_info, pvolumes):
+        data = {"/dev/sda": {"foo": "bar"}}
+        lsblk = {"TYPE": "disk"}
+        device_info(devices=data, lsblk=lsblk)
+        disk = device.Device("/dev/sda")
+        assert disk.is_device is True
 
     def test_is_partition(self, device_info, pvolumes):
         data = {"/dev/sda": {"foo": "bar"}}