mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-01 15:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/bbtests: Improve error handling

Browse Source 
Currently if a test fails the cleanup isn't performed, leading to cascade
failures in other tests. We can do better.

(From OE-Core rev: db01d6ba2ce87e1586dc8804dd823a0a038d5794)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-06-29 09:16:11 +01:00
parent dcd361f9eb
commit 58ecd46c64
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meta/lib/oeqa/selftest/bbtests.py
View File

@@ -121,9 +121,9 @@ class BitbakeTests(oeSelfTest):
@testcase(1028)
def test_environment(self):
self.append_config("TEST_ENV=\"localconf\"")
self.addCleanup(self.remove_config, "TEST_ENV=\"localconf\"")
result = runCmd('bitbake -e | grep TEST_ENV=')
self.assertTrue('localconf' in result.output)
self.remove_config("TEST_ENV=\"localconf\"")
@testcase(1029)
def test_dry_run(self):
@@ -149,9 +149,9 @@ class BitbakeTests(oeSelfTest):
result = runCmd('bitbake -r conf/prefile.conf -e | grep TEST_PREFILE=')
self.assertTrue('prefile' in result.output)
self.append_config("TEST_PREFILE=\"localconf\"")
self.addCleanup(self.remove_config, "TEST_PREFILE=\"localconf\"")
result = runCmd('bitbake -r conf/prefile.conf -e | grep TEST_PREFILE=')
self.assertTrue('localconf' in result.output)
self.remove_config("TEST_PREFILE=\"localconf\"")
@testcase(1033)
def test_postfile(self):
@@ -159,9 +159,9 @@ class BitbakeTests(oeSelfTest):
self.track_for_cleanup(postconf)
ftools.write_file(postconf , "TEST_POSTFILE=\"postfile\"")
self.append_config("TEST_POSTFILE=\"localconf\"")
self.addCleanup(self.remove_config, "TEST_POSTFILE=\"localconf\"")
result = runCmd('bitbake -R conf/postfile.conf -e | grep TEST_POSTFILE=')
self.assertTrue('postfile' in result.output)
self.remove_config("TEST_POSTFILE=\"localconf\"")
@testcase(1034)
def test_checkuri(self):
@@ -183,8 +183,8 @@ class BitbakeTests(oeSelfTest):
data = 'INCOMPATIBLE_LICENSE = "GPLv3"'
conf = os.path.join(self.builddir, 'conf/local.conf')
ftools.append_file(conf ,data)
self.addCleanup(ftools.remove_from_file, conf ,data)
result = bitbake('readline', ignore_status=True)
self.assertEqual(result.status, 0)
self.assertFalse(os.path.isfile(os.path.join(self.builddir, 'tmp/deploy/licenses/readline/generic_GPLv3')))
self.assertTrue(os.path.isfile(os.path.join(self.builddir, 'tmp/deploy/licenses/readline/generic_GPLv2')))
ftools.remove_from_file(conf ,data)