summaryrefslogtreecommitdiff
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:45:20 +0100
commit173a5896fff57136e1f15e15f90961416aadde94 (patch)
tree7a0e450e93f2f8c235ec53d09462ec9b306a8051
parent940b9d1736dbe63f80b9d46b2b9b1cea77ed35f1 (diff)
downloadopenembedded-core-173a5896fff57136e1f15e15f90961416aadde94.tar.gz
openembedded-core-173a5896fff57136e1f15e15f90961416aadde94.tar.bz2
openembedded-core-173a5896fff57136e1f15e15f90961416aadde94.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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):
bbappendfile = bbappend
break
else:
- self.assertTrue(False, 'bbappend for recipe %s does not seem to be created in test layer' % testrecipe)
+ self.fail('bbappend for recipe %s does not seem to be created in test layer' % testrecipe)
return bbappendfile
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):
self.assertIn('add-file.patch', line, 'Unexpected warning found in output:\n%s' % line)
break
else:
- self.assertTrue(False, 'Patch warning not found in output:\n%s' % output)
+ self.fail('Patch warning not found in output:\n%s' % output)
@testcase(1188)
def test_recipetool_appendfile_script(self):
@@ -351,7 +351,7 @@ class RecipetoolTests(RecipetoolBase):
bbappendfile = f
break
if not bbappendfile:
- self.assertTrue(False, 'No bbappend file created')
+ self.fail('No bbappend file created')
runCmd('rm -rf %s/recipes-*' % self.templayerdir)
return bbappendfile