Merge ~sylvain-pineau/checkbox-support:run_lsblk_from_udev_parser_entry_point into checkbox-support:master

[Sylvain Pineau]

This patch ensures that we're calling lsblk to properly categorize disk devices as such even with the following invocation:

udevadm info --export-db | plainbox dev parse udevadm

Note: The above command is used by the new json report.

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/checkbox_support/parsers/tests/test_udevadm.py b/checkbox_support/parsers/tests/test_udevadm.py
index 69a4ac3..752feeb 100644
--- a/checkbox_support/parsers/tests/test_udevadm.py
+++ b/checkbox_support/parsers/tests/test_udevadm.py
@@ -89,7 +89,7 @@ class TestUdevadmParser(TestCase, UdevadmDataMixIn):
         for i,j in enumerate(devices):
             print(i, j.category, [getattr(j, a) for a in attributes])
         """
-        lsblk=None
+        lsblk = ''
         if with_lsblk:
             lsblk = self.get_lsblk(name)
         return parse_udevadm_output(
diff --git a/checkbox_support/parsers/udevadm.py b/checkbox_support/parsers/udevadm.py
index 18e5b8e..db81070 100644
--- a/checkbox_support/parsers/udevadm.py
+++ b/checkbox_support/parsers/udevadm.py
@@ -22,6 +22,7 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 from collections import OrderedDict
+from subprocess import check_output, CalledProcessError
 import re
 import string
 
@@ -1046,6 +1047,12 @@ def parse_udevadm_output(output, lsblk=None, bits=None):
     :returns: :class:`UdevadmParser` object that corresponds to the
     parsed input
     """
+    if lsblk is None:
+        try:
+            lsblk = check_output(
+                ['lsblk', '-i', '-n', '-P', '-o', 'KNAME,TYPE,MOUNTPOINT'])
+        except CalledProcessError as exc:
+            lsblk = ''
     udev = UdevadmParser(output, lsblk, bits)
     result = UdevResult()
     udev.run(result)