summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-05 14:37:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-24 23:47:02 +0100
commit21f9844fa96bbeadf78283e274dfd879ae60f6bb (patch)
tree12049565c2810cf7b3f51d6149d4b10d94574e1e /meta/lib
parentd114b561b152ebffad127805337382f9bb4c1d7a (diff)
downloadpoky-21f9844fa96bbeadf78283e274dfd879ae60f6bb.tar.gz
oe-selftest: replace assertTrue(False, ...) with fail(...)
I'd somehow missed the existence of fail() when I wrote these. It's preferable here so you don't get the somewhat useless "false is not true" message in the case of failure. (From OE-Core rev: 173a5896fff57136e1f15e15f90961416aadde94) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/devtool.py2
-rw-r--r--meta/lib/oeqa/selftest/recipetool.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 947d8eecf1..70ee634c71 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -51,7 +51,7 @@ class DevtoolBase(oeSelfTest):
51 bbappendfile = bbappend 51 bbappendfile = bbappend
52 break 52 break
53 else: 53 else:
54 self.assertTrue(False, 'bbappend for recipe %s does not seem to be created in test layer' % testrecipe) 54 self.fail('bbappend for recipe %s does not seem to be created in test layer' % testrecipe)
55 return bbappendfile 55 return bbappendfile
56 56
57 def _create_temp_layer(self, templayerdir, addlayer, templayername, priority=999, recipepathspec='recipes-*/*'): 57 def _create_temp_layer(self, templayerdir, addlayer, templayername, priority=999, recipepathspec='recipes-*/*'):
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py
index 689d41b740..c34ad68870 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/meta/lib/oeqa/selftest/recipetool.py
@@ -282,7 +282,7 @@ class RecipetoolTests(RecipetoolBase):
282 self.assertIn('add-file.patch', line, 'Unexpected warning found in output:\n%s' % line) 282 self.assertIn('add-file.patch', line, 'Unexpected warning found in output:\n%s' % line)
283 break 283 break
284 else: 284 else:
285 self.assertTrue(False, 'Patch warning not found in output:\n%s' % output) 285 self.fail('Patch warning not found in output:\n%s' % output)
286 286
287 @testcase(1188) 287 @testcase(1188)
288 def test_recipetool_appendfile_script(self): 288 def test_recipetool_appendfile_script(self):
@@ -351,7 +351,7 @@ class RecipetoolTests(RecipetoolBase):
351 bbappendfile = f 351 bbappendfile = f
352 break 352 break
353 if not bbappendfile: 353 if not bbappendfile:
354 self.assertTrue(False, 'No bbappend file created') 354 self.fail('No bbappend file created')
355 runCmd('rm -rf %s/recipes-*' % self.templayerdir) 355 runCmd('rm -rf %s/recipes-*' % self.templayerdir)
356 return bbappendfile 356 return bbappendfile
357 357