mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00
Code Issues Projects Releases Wiki Activity

selftest/sstatetests: move exception list for cache objects to the parent class

Browse Source 
This is useful not just in cdn/local cache tests, but also in the build bundle test,
and so should be applied by default.

(From OE-Core rev: 37f0ba71868ef1907883ab751c82ba222fbc87da)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-05-07 13:46:28 +02:00
committed by Richard Purdie
parent c149c74605
commit f4663a02e5
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/cases/sstatetests.py
+13 -13
View File
@@ -918,13 +918,24 @@ INHERIT += "base-do-configure-modified"
expected_sametmp_output, expected_difftmp_output)
class SStateCheckObjectPresence(SStateBase):
def check_bb_output(self, output, exceptions, check_cdn):
def check_bb_output(self, output, targets, exceptions, check_cdn):
def is_exception(object, exceptions):
for e in exceptions:
if re.search(e, object):
return True
return False
# sstate is checked for existence of these, but they never get written out to begin with
exceptions += ["{}.*image_qa".format(t) for t in targets.split()]
exceptions += ["{}.*deploy_source_date_epoch".format(t) for t in targets.split()]
exceptions += ["{}.*image_complete".format(t) for t in targets.split()]
exceptions += ["linux-yocto.*shared_workdir"]
# these get influnced by IMAGE_FSTYPES tweaks in yocto-autobuilder-helper's config.json (on x86-64)
# additionally, they depend on noexec (thus, absent stamps) package, install, etc. image tasks,
# which makes tracing other changes difficult
exceptions += ["{}.*create_spdx".format(t) for t in targets.split()]
exceptions += ["{}.*create_runtime_spdx".format(t) for t in targets.split()]
output_l = output.splitlines()
for l in output_l:
if l.startswith("Sstate summary"):
@@ -962,17 +973,6 @@ class SStateCheckObjectPresence(SStateBase):
@OETestTag("yocto-mirrors")
class SStateMirrors(SStateCheckObjectPresence):
def run_test(self, machine, targets, exceptions, check_cdn = True, ignore_errors = False):
# sstate is checked for existence of these, but they never get written out to begin with
exceptions += ["{}.*image_qa".format(t) for t in targets.split()]
exceptions += ["{}.*deploy_source_date_epoch".format(t) for t in targets.split()]
exceptions += ["{}.*image_complete".format(t) for t in targets.split()]
exceptions += ["linux-yocto.*shared_workdir"]
# these get influnced by IMAGE_FSTYPES tweaks in yocto-autobuilder-helper's config.json (on x86-64)
# additionally, they depend on noexec (thus, absent stamps) package, install, etc. image tasks,
# which makes tracing other changes difficult
exceptions += ["{}.*create_spdx".format(t) for t in targets.split()]
exceptions += ["{}.*create_runtime_spdx".format(t) for t in targets.split()]
if check_cdn:
self.config_sstate(True)
self.append_config("""
@@ -988,7 +988,7 @@ MACHINE = "{}"
bitbake("-S none {}".format(targets))
if ignore_errors:
return
self.check_bb_output(result.output, exceptions, check_cdn)
self.check_bb_output(result.output, targets, exceptions, check_cdn)
def test_cdn_mirror_qemux86_64(self):
exceptions = []