summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-05-15 12:11:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-16 14:08:28 +0100
commit37c1dd150c8eeb741462e852907df85f48980014 (patch)
tree33b73baa519c8a30c35e81bfe7c5e108bbde3ef7 /meta
parent9f269d1e51ba0a7af412860cebf7827357cf9758 (diff)
downloadpoky-37c1dd150c8eeb741462e852907df85f48980014.tar.gz
oeqa/selftest: relax whitespace matches in search regex
Latest DNF has changed the amount of whitespace it outputs so use matches instead of hardcoding the exact number of spaces. (From OE-Core rev: 9ebeb374e49ecedecba8fe16fff3717edbc41994) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 a6e0203f5a..ce37ea457c 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("Installing : packagegroup-core-ssh-openssh", log_data_created) 25 incremental_created = re.search(r"Installing\s*:\s*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("Erasing : packagegroup-core-ssh-openssh", log_data_removed) 30 incremental_removed = re.search(r"Erasing\s*:\s*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)