From patchwork Mon May 15 11:30:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 99810 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1497311qge; Mon, 15 May 2017 04:31:13 -0700 (PDT) X-Received: by 10.99.160.68 with SMTP id u4mr5650453pgn.39.1494847873816; Mon, 15 May 2017 04:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494847873; cv=none; d=google.com; s=arc-20160816; b=t99BID+qJpSBr9oWD3NUqFdCtv78j/XFe85ACN++CvIIsLl0+edqLG1s1sagJTqmyF JCXtER68xpmYXrBKAdLQ5PEnpXqthIFx2nPaFn6obb/kkwR8wtJjOIvzpfBHSqyiTvgO 04LOeqhmPx4IpBt54NZsQb+uPsSBCwitJEG4qx+E1tpx06gVeG0fjh3moj3BtcBDwr0x FwabOOOKeXjVe8sBOmpgXA6KCer2D4m/R9on/v4U3bsPwpG+ZAugMFNTkgS5duZ3DAwG nj83r4pTvM0wZ405DOQYk7M5SLZEpMmfaftBbG4uS0OI+2FFEFjBlivRFtGujzDJzSPh vayw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=9Gjpm8kzrVxxdumZ+jNYOu3Ik5uO3KAxZWe0OoOh120=; b=TwZ4kuYcGrYU6fTao3AMjyp7oI1xDJl2AQyLuAmEGGYCPvi60qLl9O46Xak0zUvj+D jXi5VB9zsttsnx8C/cBLzXfM4FOXkeLmiakedcwazHQpeOkmNER3ggFlMvMOgwfpIXE/ IfA47IgNd0OfcqmjZSfo+rAygjEzrQ3t4Tjfayhg2uRIwCAkebRU1sc92ORhd8y1Mibj pTJla7IS+BhqcHJhAUk4RVv4xCvIut8xc0fzb4TylCqmpVEdXaWt4EQ7ZUm/7GBsuSY0 axyUlXV4364FwMORzU/ic/SWMH9114Q0AJarwpyyRCTCrVygjBOO76/6cPaAvvTa1YXs plVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w13si10458115pfl.311.2017.05.15.04.31.13; Mon, 15 May 2017 04:31:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8FF3D71CA7; Mon, 15 May 2017 11:30:55 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by mail.openembedded.org (Postfix) with ESMTP id B518971C14 for ; Mon, 15 May 2017 11:30:46 +0000 (UTC) Received: by mail-wm0-f49.google.com with SMTP id b84so79547613wmh.0 for ; Mon, 15 May 2017 04:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=xe5lwHBVWfklvEgg29cE37F+5wPdzeMRazy3FTZz92w=; b=tDXVb7lYSUFCoFWfTve62l0kJv0xeF3X4iGcC7+qbNcXlkJoEAVLJ44kQe+42RSFDL vZJ6dmUuFq/jU68MWw8xXGxI2rGPWQpm8/xspa3ULMGHAx4L8cB9wqUZLuxUeOYGnZkd Og/5z6EWcX6D/yzxZ0pXMwwl/sKOb9Zv3qxWcqH60FFOQ99bKKHaiIeXKnhtAdJdDKfI Kc6v9zXj033GLTkBFDtVjX2DH0r3+1ORwkafmszyKnFXjWc21HMTurMev2dE/4J6yLg3 R+vHhfJ3ecSgfKNrLA+6rMAoRbmjbrTJOT3i3mq3IPujVwH/WGxuUZ5FhZTaVcCswsjf Niww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=xe5lwHBVWfklvEgg29cE37F+5wPdzeMRazy3FTZz92w=; b=ZDMYsmr9ZSrCwjetvoFxZhh/oV2DlwEXKcHUwQOyd7csI0gRgcs3dLvt4jkr6XvI7k 2glBRTAw//R/wR/rrQG5AoRWeOxb63IadtbycrlgGxtpynWTfD+N+7u1JNG4wz22wVrY DueV34cyC8xthyIw3a013qJbzzmnn94+9ZtiQsXivfyyK6zSrZK+TIYLdOA6A0KUyCTD dho9GFEH3FargOfiwRIQmsG6Jzk+7spC0NcAxixz8kiiIsfMRnC2sF429glfFCtsVrk3 +Zi0FtBAIPHYoHhjftn6j7b8qum54UsAjuE8KiOl0a/UdoZUyWqqT9OcGx+G8a1YF9Bu Ki6g== X-Gm-Message-State: AODbwcBrE30ntfKUv/Est/9vxfGAefn90Ko87ufAUa69gSfUqkBy+M+r sX90uhHN7vUMbFFuiJA= X-Received: by 10.28.103.3 with SMTP id b3mr3272746wmc.5.1494847847303; Mon, 15 May 2017 04:30:47 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id e125sm14198231wmd.33.2017.05.15.04.30.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 May 2017 04:30:46 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 15 May 2017 12:30:43 +0100 Message-Id: <1494847843-25125-1-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 2.8.1 Subject: [OE-core] [PATCH] oeqa/selftest: relax whitespace matches in search regex X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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 --- meta/lib/oeqa/selftest/buildoptions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.8.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core 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)