[OE-core] [PATCH] oeqa/bblayers.py: Show useful failure msg. for all test cases

[Costin Constantin]

Signed-off-by: Costin Constantin <costin.c.constantin at intel.com>
---
 meta/lib/oeqa/selftest/bblayers.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/lib/oeqa/selftest/bblayers.py b/meta/lib/oeqa/selftest/bblayers.py
index bf3dd1b..6a9c097 100644
--- a/meta/lib/oeqa/selftest/bblayers.py
+++ b/meta/lib/oeqa/selftest/bblayers.py
@@ -14,12 +14,12 @@ class BitbakeLayers(oeSelfTest):
     @testcase(756)
     def test_bitbakelayers_showcrossdepends(self):
         result = runCmd('bitbake-layers show-cross-depends')
-        self.assertTrue('aspell' in result.output)
+        self.assertTrue('aspell' in result.output, msg = "No dependencies were shown. To debug, please manually run \"bitbake-layers show-cross-depends\"")
 
     @testcase(83)
     def test_bitbakelayers_showlayers(self):
         result = runCmd('bitbake-layers show-layers')
-        self.assertTrue('meta-selftest' in result.output)
+        self.assertTrue('meta-selftest' in result.output, msg = "No layers were shown. Please check your conf/bblayers.conf and run \"bitbake-layers show-layers\"")
 
     @testcase(93)
     def test_bitbakelayers_showappends(self):
@@ -34,14 +34,14 @@ class BitbakeLayers(oeSelfTest):
     @testcase(95)
     def test_bitbakelayers_flatten(self):
         testoutdir = os.path.join(self.builddir, 'test_bitbakelayers_flatten')
-        self.assertFalse(os.path.isdir(testoutdir))
+        self.assertFalse(os.path.isdir(testoutdir), msg = "test_bitbakelayers_flatten should not exist at this point in time")
         self.track_for_cleanup(testoutdir)
         result = runCmd('bitbake-layers flatten %s' % testoutdir)
         bb_file = os.path.join(testoutdir, 'recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb')
-        self.assertTrue(os.path.isfile(bb_file))
+        self.assertTrue(os.path.isfile(bb_file), msg = "Cannot find xcursor-transparent-theme_0.1.1.bb in the test_bitbakelayers_flatten local dir.")
         contents = ftools.read_file(bb_file)
         find_in_contents = re.search("##### bbappended from meta-selftest #####\n(.*\n)*include test_recipe.inc", contents)
-        self.assertTrue(find_in_contents)
+        self.assertTrue(find_in_contents, msg = "Flattening layers did not work.")
 
     @testcase(1195)
     def test_bitbakelayers_add_remove(self):
@@ -50,13 +50,13 @@ class BitbakeLayers(oeSelfTest):
         self.assertNotIn('meta-skeleton', result.output, 'This test cannot run with meta-skeleton in bblayers.conf')
         result = runCmd('bitbake-layers add-layer %s' % test_layer)
         result = runCmd('bitbake-layers show-layers')
-        self.assertIn('meta-skeleton', result.output)
+        self.assertIn('meta-skeleton', result.output, msg = "Something wrong happened. meta-skeleton layer was not added to conf/bblayers.conf")
         result = runCmd('bitbake-layers remove-layer %s' % test_layer)
         result = runCmd('bitbake-layers show-layers')
-        self.assertNotIn('meta-skeleton', result.output)
+        self.assertNotIn('meta-skeleton', result.output, msg = "meta-skeleton should have been removed at this step.")
         result = runCmd('bitbake-layers add-layer %s' % test_layer)
         result = runCmd('bitbake-layers show-layers')
-        self.assertIn('meta-skeleton', result.output)
+        self.assertIn('meta-skeleton', result.output, msg = "Something wrong happened. meta-skeleton layer was not added to conf/bblayers.conf")
         result = runCmd('bitbake-layers remove-layer */meta-skeleton')
         result = runCmd('bitbake-layers show-layers')
-        self.assertNotIn('meta-skeleton', result.output)
+        self.assertNotIn('meta-skeleton', result.output, msg = "meta-skeleton should have been removed at this step.")
-- 
2.1.4