[OE-core] [PATCH] oescripts.py: fix skip count behavior in OEPybootchartguyTests

[Trevor Gamblin]

Prior to this fix, the try/except block in OEScriptTests' setUpClass
did both the import and the raise unittest.SkipTest for the
subsequent OEPybootchartguyTests. The consequence of the this meant
that, when cairo was not available on the test host, the raise was
counted only once as a class setup failure, instead of once for each
of the tests to be run, resulting in incorrect skip counts in the
test results.

Instead of raising unittest.SkipTest in setUpClass, this change
sets the boolean cls.import_failure, which is then checked by the
individual test methods in OEPybootchartguyTests. If it is True,
each method will raise unittest.SkipTest individually, with a
message string equal to the value of cls.import_failure_msg.

Signed-off-by: Trevor Gamblin <trevor.gamblin at windriver.com>
---
 meta/lib/oeqa/selftest/cases/oescripts.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py
index 41cbe04808..7ab80f48f0 100644
--- a/meta/lib/oeqa/selftest/cases/oescripts.py
+++ b/meta/lib/oeqa/selftest/cases/oescripts.py
@@ -38,30 +38,43 @@ class OEScriptTests(OESelftestTestCase):
     @classmethod
     def setUpClass(cls):
         super(OEScriptTests, cls).setUpClass()
+        # track the success of importing the required module, so that
+        # individual tests can raise unittest.SkipTest
+        cls.import_failure = False
         try:
             import cairo
         except ImportError:
-            raise unittest.SkipTest('Python module cairo is not present')
-        bitbake("core-image-minimal -c rootfs -f")
-        cls.tmpdir = get_bb_var('TMPDIR')
-        cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1]
+            cls.import_failure = True
+            cls.import_failure_msg = "Python module cairo is not present"
+        else:
+            bitbake("core-image-minimal -c rootfs -f")
+            cls.tmpdir = get_bb_var('TMPDIR')
+            cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1]
 
     scripts_dir = os.path.join(get_bb_var('COREBASE'), 'scripts')
 
 class OEPybootchartguyTests(OEScriptTests):
 
     def test_pybootchartguy_help(self):
+        if self.import_failure:
+            raise unittest.SkipTest(self.import_failure_msg)
         runCmd('%s/pybootchartgui/pybootchartgui.py  --help' % self.scripts_dir)
 
     def test_pybootchartguy_to_generate_build_png_output(self):
+        if self.import_failure:
+            raise unittest.SkipTest(self.import_failure_msg)
         runCmd('%s/pybootchartgui/pybootchartgui.py  %s -o %s/charts -f png' % (self.scripts_dir, self.buildstats, self.tmpdir))
         self.assertTrue(os.path.exists(self.tmpdir + "/charts.png"))
 
     def test_pybootchartguy_to_generate_build_svg_output(self):
+        if self.import_failure:
+            raise unittest.SkipTest(self.import_failure_msg)
         runCmd('%s/pybootchartgui/pybootchartgui.py  %s -o %s/charts -f svg' % (self.scripts_dir, self.buildstats, self.tmpdir))
         self.assertTrue(os.path.exists(self.tmpdir + "/charts.svg"))
 
     def test_pybootchartguy_to_generate_build_pdf_output(self):
+        if self.import_failure:
+            raise unittest.SkipTest(self.import_failure_msg)
         runCmd('%s/pybootchartgui/pybootchartgui.py  %s -o %s/charts -f pdf' % (self.scripts_dir, self.buildstats, self.tmpdir))
         self.assertTrue(os.path.exists(self.tmpdir + "/charts.pdf"))
 
-- 
2.23.0