Latest DNF has changed the amount of whitespace it outputs so use matches
instead of hardcoding the exact number of spaces.
Signed-off-by: Ross Burton <ross.bur...@intel.com>
---
meta/lib/oeqa/selftest/buildoptions.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/selftest/buildoptions.py
b/meta/lib/oeqa/selftest/buildoptions.py
index a6e0203..ce37ea4 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/meta/lib/oeqa/selftest/buildoptions.py
@@ -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)
--
2.8.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
