fix: py3 compat in ConsoleLogHelper and InstallFailureDetector

Signed-off-by: Martin Styk <mart.styk@gmail.com>

Author: StykMartin

LabController/src/bkr/labcontroller/proxy.py

@@ -196,7 +196,7 @@ def __init__(self, watchdog, proxy, panic, logfile_name=None):
         self.proxy = proxy
         self.logfile_name = logfile_name if logfile_name is not None else "console.log"
         self.strip_ansi = re.compile("(\033\[[0-9;\?]*[ABCDHfsnuJKmhr])")
-        ascii_control_chars = map(chr, range(0, 32) + [127])
+        ascii_control_chars = [chr(c) for c in list(range(0, 32)) + [127]]
         keep_chars = '\t\n'
         strip_control_chars = [c for c in ascii_control_chars if c not in keep_chars]
         self.strip_cntrl = re.compile('[%s]' % re.escape(''.join(strip_control_chars)))
@@ -410,8 +410,11 @@ def _load_patterns(self):
                 else:
                     raise
         for p in package_patterns:
-            patterns.append(pkg_resources.resource_string('bkr.labcontroller',
-                    'install-failure-patterns/' + p))
+            raw = pkg_resources.resource_string('bkr.labcontroller',
+                    'install-failure-patterns/' + p)
+            if not isinstance(raw, str):
+                raw = raw.decode('utf-8')
+            patterns.append(raw)
         return patterns
 
     def feed(self, line):

LabController/src/bkr/labcontroller/test_proxy.py

@@ -6,7 +6,7 @@
 import unittest
 
 from bkr.labcontroller.config import _conf
-from bkr.labcontroller.proxy import PanicDetector
+from bkr.labcontroller.proxy import PanicDetector, ConsoleLogHelper, InstallFailureDetector
 
 
 class TestPanicDetector(unittest.TestCase):
@@ -49,3 +49,38 @@ def test_panic_detector_ignores_false_panic(self):
                             "Panic detector erroneously detected: %r" % (line))
             self.assertIsNone(match,
                             "feed result ( %r ) wasn't NoneType" % (match))
+
+
+class TestConsoleLogHelper(unittest.TestCase):
+
+    def test_strip_cntrl_regex(self):
+        helper = ConsoleLogHelper(
+            watchdog={'recipe_id': 1},
+            proxy=None,
+            panic=_conf["PANIC_REGEX"],
+        )
+        self.assertIsNone(helper.strip_cntrl.search('\t'))
+        self.assertIsNone(helper.strip_cntrl.search('\n'))
+        self.assertIsNotNone(helper.strip_cntrl.search('\x00'))
+        self.assertIsNotNone(helper.strip_cntrl.search('\x01'))
+        self.assertIsNotNone(helper.strip_cntrl.search('\x7f'))
+
+
+class TestInstallFailureDetector(unittest.TestCase):
+
+    def test_loads_patterns(self):
+        detector = InstallFailureDetector()
+        self.assertTrue(len(detector.patterns) > 0)
+
+    def test_detects_dracut_failure(self):
+        detector = InstallFailureDetector()
+        match = detector.feed(
+            'dracut-initqueue[123]: Warning: /dev/root does not exist')
+        self.assertTrue(detector.fired)
+        self.assertIsNotNone(match)
+
+    def test_ignores_normal_output(self):
+        detector = InstallFailureDetector()
+        match = detector.feed('Starting installation process')
+        self.assertFalse(detector.fired)
+        self.assertIsNone(match)