summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-02-17 18:53:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:42:17 +0000
commitf72bc777fa20422c8eaee5b592e9fe1f856623cd (patch)
tree1e8d56505131f2581ce3616596e8725ffc9d6f80 /meta/lib/oeqa
parent648a5d6c4982dbdaaaa15c41978071e5b5ed22ea (diff)
downloadpoky-f72bc777fa20422c8eaee5b592e9fe1f856623cd.tar.gz
selftest: update output checks in incremental image test to match what dnf prints
(From OE-Core rev: 6c434a711c0d281ecc9aeff488b63b80a338b229) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/selftest/buildoptions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py
index 568882ba8f..a97257e417 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/meta/lib/oeqa/selftest/buildoptions.py
@@ -22,12 +22,12 @@ class ImageOptionsTests(oeSelfTest):
22 bitbake("core-image-minimal") 22 bitbake("core-image-minimal")
23 log_data_file = os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), "temp/log.do_rootfs") 23 log_data_file = os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), "temp/log.do_rootfs")
24 log_data_created = ftools.read_file(log_data_file) 24 log_data_created = ftools.read_file(log_data_file)
25 incremental_created = re.search("NOTE: load old install solution for incremental install\nNOTE: old install solution not exist\nNOTE: creating new install solution for incremental install(\n.*)*NOTE: Installing the following packages:.*packagegroup-core-ssh-openssh", log_data_created) 25 incremental_created = re.search("Installing : packagegroup-core-ssh-openssh", log_data_created)
26 self.remove_config('IMAGE_FEATURES += "ssh-server-openssh"') 26 self.remove_config('IMAGE_FEATURES += "ssh-server-openssh"')
27 self.assertTrue(incremental_created, msg = "Match failed in:\n%s" % log_data_created) 27 self.assertTrue(incremental_created, msg = "Match failed in:\n%s" % log_data_created)
28 bitbake("core-image-minimal") 28 bitbake("core-image-minimal")
29 log_data_removed = ftools.read_file(log_data_file) 29 log_data_removed = ftools.read_file(log_data_file)
30 incremental_removed = re.search("NOTE: load old install solution for incremental install\nNOTE: creating new install solution for incremental install(\n.*)*NOTE: incremental removed:.*openssh-sshd-.*", log_data_removed) 30 incremental_removed = re.search("Erasing : packagegroup-core-ssh-openssh", log_data_removed)
31 self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) 31 self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed)
32 32
33 @testcase(286) 33 @testcase(286)