Merge lp:~sylvain-pineau/checkbox/fix-1559189 into lp:checkbox

[Sylvain Pineau]

Fixes the linked bug

[Sylvain Pineau (sylvain-pineau)]

self-approved after validating both udevadm output provided in the bug report.

review: Approve

=== modified file 'checkbox-support/checkbox_support/parsers/udevadm.py'
--- checkbox-support/checkbox_support/parsers/udevadm.py	2016-02-17 16:40:50 +0000
+++ checkbox-support/checkbox_support/parsers/udevadm.py	2016-03-29 16:52:20 +0000
@@ -633,12 +633,16 @@
         elif (self._environment.get("DEVTYPE") == "disk" and
                 "ID_MODEL_ENC" in self._environment):
             return decode_id(self._environment["ID_MODEL_ENC"])
-        if self.driver == "nvme" and self.bus == 'pci' and self._stack:
+        elif self.driver == "nvme" and self.bus == 'pci' and self._stack:
             parent = self._stack[-1]
             if parent.product:
                 return parent.product
             else:
                 return self.name
+        elif (
+            self._environment.get("DEVTYPE") == "disk" and
+            self.driver == 'virtio_blk' and self.bus == 'virtio'):
+            return self.name
 
         # floppy
         if self.driver == "floppy":
@@ -810,7 +814,7 @@
            device._mmc_type == 'MMC'):
             return False
         # Do not ignore QEMU/KVM virtio disks
-        if ("ID_PART_TABLE_TYPE" in device._environment and
+        if ("DEVTYPE" in device._environment and
            device.bus == "virtio" and
            device.driver == "virtio_blk"):
             return False