mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/selftest: relax whitespace matches in search regex

Browse Source 
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>
This commit is contained in:
Ross Burton
2017-05-15 12:11:58 +01:00
committed by Richard Purdie
parent 9f269d1e51
commit 37c1dd150c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/buildoptions.py
+2 -2
View File
@@ -22,12 +22,12 @@ class ImageOptionsTests(oeSelfTest):
bitbake("core-image-minimal")
log_data_file = os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), "temp/log.do_rootfs")
log_data_created = ftools.read_file(log_data_file)
incremental_created = re.search("Installing : packagegroup-core-ssh-openssh", log_data_created)
incremental_created = re.search(r"Installing\s*:\s*packagegroup-core-ssh-openssh", log_data_created)
self.remove_config('IMAGE_FEATURES += "ssh-server-openssh"')
self.assertTrue(incremental_created, msg = "Match failed in:\n%s" % log_data_created)
bitbake("core-image-minimal")
log_data_removed = ftools.read_file(log_data_file)
incremental_removed = re.search("Erasing : packagegroup-core-ssh-openssh", log_data_removed)
incremental_removed = re.search(r"Erasing\s*:\s*packagegroup-core-ssh-openssh", log_data_removed)
self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed)
@testcase(286)