summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-14 18:02:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-15 11:48:07 +0000
commit7d7340bf31a1003e7e98dd57e08a6d61ca55960d (patch)
tree85b63433b8ea870a5c81bbe93415995bc64c5030
parent13940a81dae451b8efa9b94f2b7f5a37fbb6c9af (diff)
downloadpoky-7d7340bf31a1003e7e98dd57e08a6d61ca55960d.tar.gz
oeqa/selftest/distrodata: Port to use the new recipeutils.get_recipe_upgrade_status() function
Rather than use the obsolete do_checkpkg function, use the new recipeutils function which uses tinfoil to get the data rather than needing csv file manipulation. (From OE-Core rev: 3f3f80b00cd999f1b2aef8f5c0ce0900aa4dcbcb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/distrodata.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py
index a862d30b10..824e29e01b 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -4,6 +4,8 @@ from oeqa.utils.decorators import testcase
4from oeqa.utils.ftools import write_file 4from oeqa.utils.ftools import write_file
5from oeqa.core.decorator.oeid import OETestID 5from oeqa.core.decorator.oeid import OETestID
6 6
7import oe.recipeutils
8
7class Distrodata(OESelftestTestCase): 9class Distrodata(OESelftestTestCase):
8 10
9 @OETestID(1902) 11 @OETestID(1902)
@@ -17,11 +19,11 @@ class Distrodata(OESelftestTestCase):
17 feature = 'INHERIT += "distrodata"\n' 19 feature = 'INHERIT += "distrodata"\n'
18 feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n' 20 feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
19 self.write_config(feature) 21 self.write_config(feature)
20 bitbake('-c checkpkg world')
21 22
22 checkpkg_result = open(os.path.join(get_bb_var("LOG_DIR"), "checkpkg.csv")).readlines()[1:] 23 pkgs = oe.recipeutils.get_recipe_upgrade_status()
23 regressed_failures = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] == 'UNKNOWN_BROKEN'] 24
24 regressed_successes = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] == 'KNOWN_BROKEN'] 25 regressed_failures = [pkg[0] for pkg in pkgs if pkg[1] == 'UNKNOWN_BROKEN']
26 regressed_successes = [pkg[0] for pkg in pkgs if pkg[1] == 'KNOWN_BROKEN']
25 msg = "" 27 msg = ""
26 if len(regressed_failures) > 0: 28 if len(regressed_failures) > 0:
27 msg = msg + """ 29 msg = msg + """