7 files changed, 31 insertions, 199 deletions

diff --git a/lib/oeqa/runtime/cases/dldt_inference_engine.py b/lib/oeqa/runtime/cases/dldt_inference_engine.py
deleted file mode 100644
index fb35d52f..00000000
--- a/lib/oeqa/runtime/cases/dldt_inference_engine.py
+++ /dev/null
@@ -1,109 +0,0 @@
-from oeqa.runtime.case import OERuntimeTestCase
-from oeqa.runtime.decorator.package import OEHasPackage
-from oeqa.core.decorator.depends import OETestDepends
-from oeqa.runtime.miutils.targets.oeqatarget import OEQATarget
-from oeqa.runtime.miutils.tests.squeezenet_model_download_test import SqueezenetModelDownloadTest
-from oeqa.runtime.miutils.tests.dldt_model_optimizer_test import DldtModelOptimizerTest
-from oeqa.runtime.miutils.tests.dldt_inference_engine_test import DldtInferenceEngineTest
-from oeqa.runtime.miutils.dldtutils import get_testdata_config
-
-class DldtInferenceEngine(OERuntimeTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.sqn_download = SqueezenetModelDownloadTest(OEQATarget(cls.tc.target), '/tmp/ie/md')
-        cls.sqn_download.setup()
-        cls.dldt_mo = DldtModelOptimizerTest(OEQATarget(cls.tc.target), '/tmp/ie/ir')
-        cls.dldt_mo.setup()
-        cls.dldt_ie = DldtInferenceEngineTest(OEQATarget(cls.tc.target), '/tmp/ie/inputs')
-        cls.dldt_ie.setup()
-        cls.ir_files_dir = cls.dldt_mo.work_dir
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.dldt_ie.tear_down()
-        cls.dldt_mo.tear_down()
-        cls.sqn_download.tear_down()
-
-    @OEHasPackage(['dldt-model-optimizer'])
-    @OEHasPackage(['wget'])
-    def test_dldt_ie_can_create_ir_and_download_input(self):
-        proxy_port = get_testdata_config(self.tc.td, 'DLDT_PIP_PROXY')
-        if not proxy_port:
-            self.skipTest('Need to configure bitbake configuration (DLDT_PIP_PROXY="proxy.server:port").')
-        (status, output) = self.sqn_download.test_can_download_squeezenet_model(proxy_port)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-        (status, output) = self.sqn_download.test_can_download_squeezenet_prototxt(proxy_port)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-        mo_exe_dir = get_testdata_config(self.tc.td, 'DLDT_MO_EXE_DIR')
-        if not mo_exe_dir:
-            self.skipTest('Need to configure bitbake configuration (DLDT_MO_EXE_DIR="directory_to_mo.py").')
-        mo_files_dir = self.sqn_download.work_dir
-        (status, output) = self.dldt_mo.test_dldt_mo_can_create_ir(mo_exe_dir, mo_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-        (status, output) = self.dldt_ie.test_can_download_input_file(proxy_port)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-samples'])
-    def test_dldt_ie_classification_with_cpu(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device('CPU', self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-samples'])
-    @OEHasPackage(['intel-compute-runtime'])
-    @OEHasPackage(['ocl-icd'])
-    def test_dldt_ie_classification_with_gpu(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device('GPU', self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-samples'])
-    @OEHasPackage(['dldt-inference-engine-vpu-firmware'])
-    def test_dldt_ie_classification_with_myriad(self):
-        device = 'MYRIAD'
-        (status, output) = self.dldt_ie.test_check_if_openvino_device_available(device)
-        if not status:
-            self.skipTest('OpenVINO %s device not available on target machine(availalbe devices: %s)' % (device, output))
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device(device, self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-python3'])
-    @OEHasPackage(['python3-opencv'])
-    @OEHasPackage(['python3-numpy'])
-    def test_dldt_ie_classification_python_api_with_cpu(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device('CPU', self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-python3'])
-    @OEHasPackage(['intel-compute-runtime'])
-    @OEHasPackage(['ocl-icd'])
-    @OEHasPackage(['python3-opencv'])
-    @OEHasPackage(['python3-numpy'])
-    def test_dldt_ie_classification_python_api_with_gpu(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device('GPU', self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-python3'])
-    @OEHasPackage(['dldt-inference-engine-vpu-firmware'])
-    @OEHasPackage(['python3-opencv'])
-    @OEHasPackage(['python3-numpy'])
-    def test_dldt_ie_classification_python_api_with_myriad(self):
-        device = 'MYRIAD'
-        (status, output) = self.dldt_ie.test_check_if_openvino_device_available(device)
-        if not status:
-            self.skipTest('OpenVINO %s device not available on target machine(availalbe devices: %s)' % (device, output))
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device(device, self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/cases/dldt_model_optimizer.py b/lib/oeqa/runtime/cases/dldt_model_optimizer.py
deleted file mode 100644
index 736ea661..00000000
--- a/lib/oeqa/runtime/cases/dldt_model_optimizer.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from oeqa.runtime.case import OERuntimeTestCase
-from oeqa.runtime.decorator.package import OEHasPackage
-from oeqa.runtime.miutils.targets.oeqatarget import OEQATarget
-from oeqa.runtime.miutils.tests.squeezenet_model_download_test import SqueezenetModelDownloadTest
-from oeqa.runtime.miutils.tests.dldt_model_optimizer_test import DldtModelOptimizerTest
-from oeqa.runtime.miutils.dldtutils import get_testdata_config
-
-class DldtModelOptimizer(OERuntimeTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.sqn_download = SqueezenetModelDownloadTest(OEQATarget(cls.tc.target), '/tmp/mo/md')
-        cls.sqn_download.setup()
-        cls.dldt_mo = DldtModelOptimizerTest(OEQATarget(cls.tc.target), '/tmp/mo/ir')
-        cls.dldt_mo.setup()
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.dldt_mo.tear_down()
-        cls.sqn_download.tear_down()
-
-    @OEHasPackage(['dldt-model-optimizer'])
-    @OEHasPackage(['wget'])
-    def test_dldt_mo_can_create_ir(self):
-        proxy_port = get_testdata_config(self.tc.td, 'DLDT_PIP_PROXY')
-        if not proxy_port:
-            self.skipTest('Need to configure bitbake configuration (DLDT_PIP_PROXY="proxy.server:port").')
-        (status, output) = self.sqn_download.test_can_download_squeezenet_model(proxy_port)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-        (status, output) = self.sqn_download.test_can_download_squeezenet_prototxt(proxy_port)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-        mo_exe_dir = get_testdata_config(self.tc.td, 'DLDT_MO_EXE_DIR')
-        if not mo_exe_dir:
-            self.skipTest('Need to configure bitbake configuration (DLDT_MO_EXE_DIR="directory_to_mo.py").')
-        mo_files_dir = self.sqn_download.work_dir
-        (status, output) = self.dldt_mo.test_dldt_mo_can_create_ir(mo_exe_dir, mo_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/cases/jhi.py b/lib/oeqa/runtime/cases/jhi.py
deleted file mode 100644
index 7a24b6da..00000000
--- a/lib/oeqa/runtime/cases/jhi.py
+++ /dev/null
@@ -1,41 +0,0 @@
-import os
-from oeqa.runtime.decorator.package import OEHasPackage
-from oeqa.runtime.case import OERuntimeTestCase
-from oeqa.core.decorator.depends import OETestDepends
-
-class JhiTest(OERuntimeTestCase):
-
-    @classmethod
-    def tearDownClass(cls):
-        _, output = cls.tc.target.run('pidof jhid')
-        cls.tc.target.run('kill %s' % output)
-
-    @OEHasPackage(['openssh-sshd'])
-    @OEHasPackage(['jhi'])
-    def test_jhi_mei_driver(self):
-        command = 'ls /dev/mei*'
-        (status, output) = self.target.run(command)
-        self.assertEqual(status, 0, msg="Error messages: %s" % output)
-
-    @OETestDepends(['jhi.JhiTest.test_jhi_mei_driver'])
-    def test_jhi_daemon_version(self):
-        command = 'jhid -v'
-        (status, output) = self.target.run(command)
-        self.assertEqual(status, 0, msg="Error messages: %s" % output)
-
-    @OETestDepends(['jhi.JhiTest.test_jhi_mei_driver'])
-    def test_jhi_daemon_can_initialized(self):
-        command = 'jhid -d'
-        (status, output) = self.target.run(command)
-        self.assertEqual(status, 0, msg="Error messages: %s" % output)
-
-    @OEHasPackage(['jhi-test'])
-    @OETestDepends(['jhi.JhiTest.test_jhi_daemon_can_initialized'])
-    def test_jhi_bist(self):
-        (status, output) = self.target.run('uname -m')
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-        if 'x86_64' not in output:
-            self.skipTest("Skipped jhi bist test if not x86_64 machine (current machine: %s)." % output)
-        command = 'bist'
-        (status, output) = self.target.run(command)
-        self.assertEqual(status, 0, msg="Error messages: %s" % output)
diff --git a/lib/oeqa/runtime/cases/microcode.py b/lib/oeqa/runtime/cases/microcode.py
index 6ce36a6f..52c1cdb4 100644
--- a/lib/oeqa/runtime/cases/microcode.py
+++ b/lib/oeqa/runtime/cases/microcode.py
@@ -16,20 +16,15 @@ class MicrocodeTest(OERuntimeTestCase):
 
     @OEHasPackage(["iucode-tool"])
     def test_microcode_update(self):
-        (status, output) = self.target.run('iucode_tool /lib/firmware/intel-ucode/ -tb -lS | grep rev')
-        if status:
-            self.skipTest("The iucode_tool detected no microcode for update.")
+        (status, output) = self.target.run('iucode_tool /lib/firmware/intel-ucode/ -tb -l --scan-system=2 | grep rev')
 
         selected_microcodes = output.splitlines()
         selected_rev_list = self.get_revision_from_microcode_string_list(selected_microcodes, "rev (\w*)")
-        self.assertTrue(selected_rev_list, msg="Could not find any rev from iucode_tool selected microcode.")
 
-        (status, output) = self.target.run('dmesg | grep microcode')
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+        (status, output) = self.target.run("dmesg | grep 'microcode updated early'")
 
         updated_microcodes = output.splitlines()
-        updated_rev_list = self.get_revision_from_microcode_string_list(updated_microcodes, "revision=(\w*)")
-        self.assertTrue(updated_rev_list, msg="Could not find any updated revision from microcode dmesg.")
+        updated_rev_list = self.get_revision_from_microcode_string_list(updated_microcodes, "revision (\w*)")
 
         for ul in updated_rev_list:
             self.assertTrue(ul in selected_rev_list, msg="Updated revision, %s, not in selected revision list (%s)" %
diff --git a/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt b/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt
new file mode 100644
index 00000000..84ce8168
--- /dev/null
+++ b/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt
@@ -0,0 +1,9 @@
+# These should be reviewed to see if they are still needed
+ACPI: No _BQC method, cannot determine initial brightness
+[Firmware Bug]: ACPI: No _BQC method, cannot determine initial brightness
+(EE) Failed to load module "psb"
+(EE) Failed to load module "psbdrv"
+(EE) open /dev/fb0: No such file or directory
+(EE) AIGLX: reverting to software rendering
+dmi: Firmware registration failed.
+ioremap error for 0x78
diff --git a/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt b/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt
new file mode 100644
index 00000000..5c9b4bc7
--- /dev/null
+++ b/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt
@@ -0,0 +1,14 @@
+# These should be reviewed to see if they are still needed
+can't set Max Payload Size to 256
+intel_punit_ipc: can't request region for resource
+[drm] parse error at position 4 in video mode 'efifb'
+ACPI Error: Could not enable RealTimeClock event
+ACPI Warning: Could not enable fixed event - RealTimeClock
+hci_intel INT33E1:00: Unable to retrieve gpio
+hci_intel: probe of INT33E1:00 failed
+can't derive routing for PCI INT A
+failed to read out thermal zone
+Bluetooth: hci0: Setting Intel event mask failed
+ttyS2 - failed to request DMA
+Bluetooth: hci0: Failed to send firmware data (-38)
+atkbd serio0: Failed to enable keyboard on isa0060/serio0
diff --git a/lib/oeqa/runtime/cases/thermald.py b/lib/oeqa/runtime/cases/thermald.py
index b0efecd8..a0b6a92b 100644
--- a/lib/oeqa/runtime/cases/thermald.py
+++ b/lib/oeqa/runtime/cases/thermald.py
@@ -19,7 +19,7 @@ class ThermaldTest(OERuntimeTestCase):
     def run_thermald_emulation_to_exceed_setpoint_then_end_thermald_process(self, run_args):
         time.sleep(2)
         self.target.run('echo 106000 > /sys/class/thermal/thermal_zone%s/emul_temp' % run_args)
-        time.sleep(2)
+        time.sleep(5)
         __, output = self.target.run('pidof thermald')
         self.target.run('kill -9 %s' % output)
 
@@ -27,7 +27,8 @@ class ThermaldTest(OERuntimeTestCase):
         # Thermald test depend on thermal emulation, where CONFIG_THERMAL_EMULATION=y was required
         # To enable thermal emulation, refer to https://github.com/intel/thermal_daemon/blob/master/test/readme_test.txt
         (status, output) = self.target.run('gzip -dc /proc/config.gz | grep CONFIG_THERMAL_EMULATION=y')
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+        if status:
+            self.skipTest("CONFIG_THERMAL_EMULATION is not set")
 
     @OEHasPackage(['thermald'])
     @OETestDepends(['thermald.ThermaldTest.test_thermald_emulation_mode'])
@@ -38,7 +39,8 @@ class ThermaldTest(OERuntimeTestCase):
         td_thread = threading.Thread(target=self.run_thermald_emulation_to_exceed_setpoint_then_end_thermald_process,
                                      args=(x86_thermal_zone_index,))
         td_thread.start()
-        status, output = self.target.run('thermald --no-daemon --loglevel=info')
+        td_thread.join()
+        status, output = self.target.run('timeout 3s thermald --no-daemon --loglevel=info')
         regex_search = ".*thd_cdev_set_state.*106000"
         regex_comp = re.compile(regex_search)
         m = regex_comp.search(output)