From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id 9A0E060DDF for ; Thu, 27 Feb 2014 13:57:49 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 27 Feb 2014 05:57:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,555,1389772800"; d="scan'208";a="490900298" Received: from linux.jf.intel.com (HELO linux.intel.com) ([10.23.219.25]) by orsmga002.jf.intel.com with ESMTP; 27 Feb 2014 05:57:48 -0800 Received: from [10.237.108.30] (apalalax-mobl.ger.corp.intel.com [10.237.108.30]) by linux.intel.com (Postfix) with ESMTP id 48E1A6A4083; Thu, 27 Feb 2014 05:57:38 -0800 (PST) Message-ID: <530F445B.2030500@linux.intel.com> Date: Thu, 27 Feb 2014 15:57:47 +0200 From: Alexandru Palalau Organization: Intel OTC User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Corneliu Stoicescu , openembedded-core@lists.openembedded.org References: <1393509196-26371-1-git-send-email-corneliux.stoicescu@intel.com> In-Reply-To: <1393509196-26371-1-git-send-email-corneliux.stoicescu@intel.com> Subject: Re: [PATCH] oe-selftest: Fix for test_rm_old_image 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: , X-List-Received-Date: Thu, 27 Feb 2014 13:57:53 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 2/27/2014 3:53 PM, Corneliu Stoicescu wrote: > After recent changes in poky this test was not working as it should. > This commit fixes and improves the test logic. > > Signed-off-by: Corneliu Stoicescu > --- > meta/lib/oeqa/selftest/buildoptions.py | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py > index ef6579b..93b02cf 100644 > --- a/meta/lib/oeqa/selftest/buildoptions.py > +++ b/meta/lib/oeqa/selftest/buildoptions.py > @@ -26,10 +26,16 @@ class ImageOptionsTests(oeSelfTest): > bitbake("core-image-minimal") > deploydir = get_bb_var("DEPLOY_DIR_IMAGE", target="core-image-minimal") > imagename = get_bb_var("IMAGE_LINK_NAME", target="core-image-minimal") > - oldimgpath = os.path.realpath(os.path.join(deploydir, imagename + ".ext3")) > + deploydir_files = os.listdir(deploydir) > + track_original_files = [] > + for image_file in deploydir_files: > + if imagename in image_file and os.path.islink(os.path.join(deploydir, image_file)): > + track_original_files.append(os.path.realpath(os.path.join(deploydir, image_file))) > self.append_config("RM_OLD_IMAGE = \"1\"") > - bitbake("core-image-minimal") > - self.assertFalse(os.path.exists(oldimgpath), msg="Old image path still exists: %s" % oldimgpath) > + bitbake("-C rootfs core-image-minimal") > + deploydir_files = os.listdir(deploydir) The line above appears twice. > + remaining_not_expected = [path for path in track_original_files if os.path.basename(path) in deploydir_files] > + self.assertFalse(remaining_not_expected, msg="\nThe following image files ware not removed: %s" % ', '.join(map(str, remaining_not_expected))) > > def test_ccache_tool(self): > bitbake("ccache-native") > Cheers, -- Alexandru Palalau