mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

selftest/buildhistory: Improve test to remove sources of error

Browse Source 
When we add buildhistory, we expect do_rootfs to rerun, but depending
on IMAGE_FSTYPES, the number of tasks which would execute after
do_rootfs varies (e.g. live would add do_bootimg and we recently
added do_image).

Therefore limit the test to -c rootfs and then we're clear that only
one task should re-run.

(From OE-Core rev: 9e9a33281e6008c3b699b5bbb738921829dbc501)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2016-01-17 11:17:47 +00:00
parent 05716dd7ee
commit 12e37e7c79
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/buildoptions.py
+5 -9
View File
@@ -122,7 +122,7 @@ class BuildhistoryTests(BuildhistoryBase):
def test_buildhistory_does_not_change_signatures(self): def test_buildhistory_does_not_change_signatures(self):
""" """
Summary: Ensure that buildhistory does not change signatures Summary: Ensure that buildhistory does not change signatures
Expected: Only 'do_rootfs' and 'do_build' tasks are rerun Expected: Only 'do_rootfs' task should be rerun
Product: oe-core Product: oe-core
Author: Daniel Istrate <daniel.alexandrux.istrate@intel.com> Author: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
@@ -139,12 +139,12 @@ class BuildhistoryTests(BuildhistoryBase):
features = 'TMPDIR = "%s"\n' % tmpdir1 features = 'TMPDIR = "%s"\n' % tmpdir1
self.write_config(features) self.write_config(features)
bitbake('core-image-sato -S none') bitbake('core-image-sato -S none -c rootfs')
features = 'TMPDIR = "%s"\n' % tmpdir2 features = 'TMPDIR = "%s"\n' % tmpdir2
features += 'INHERIT += "buildhistory"\n' features += 'INHERIT += "buildhistory"\n'
self.write_config(features) self.write_config(features)
bitbake('core-image-sato -S none') bitbake('core-image-sato -S none -c rootfs')
def get_files(d): def get_files(d):
f = [] f = []
@@ -161,24 +161,20 @@ class BuildhistoryTests(BuildhistoryBase):
f2 = set(files2) f2 = set(files2)
sigdiff = f1 - f2 sigdiff = f1 - f2
self.assertEqual(len(sigdiff), 2, 'Expected 2 signature differences. Out: %s' % list(sigdiff)) self.assertEqual(len(sigdiff), 1, 'Expected 1 signature differences. Out: %s' % list(sigdiff))
unexpected_diff = [] unexpected_diff = []
# No new signatures should appear apart from do_rootfs and do_build # No new signatures should appear apart from do_rootfs
found_do_rootfs_flag = False found_do_rootfs_flag = False
found_do_build_flag = False
for sig in sigdiff: for sig in sigdiff:
if 'do_rootfs' in sig: if 'do_rootfs' in sig:
found_do_rootfs_flag = True found_do_rootfs_flag = True
elif 'do_build' in sig:
found_do_build_flag = True
else: else:
unexpected_diff.append(sig) unexpected_diff.append(sig)
self.assertTrue(found_do_rootfs_flag, 'Task do_rootfs did not rerun.') self.assertTrue(found_do_rootfs_flag, 'Task do_rootfs did not rerun.')
self.assertTrue(found_do_build_flag, 'Task do_build did not rerun')
self.assertFalse(unexpected_diff, 'Found unexpected signature differences. Out: %s' % unexpected_diff) self.assertFalse(unexpected_diff, 'Found unexpected signature differences. Out: %s' % unexpected_diff)