From patchwork Tue Dec 11 18:20:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 153486 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp935887ljp; Tue, 11 Dec 2018 10:21:23 -0800 (PST) X-Google-Smtp-Source: AFSGD/VfTPklhDTK4mpYfDEL/GzvWvVvRQxye4MhNJjzDtyWO7/g0faH/hdc3IR8nNJvarDT5B+l X-Received: by 2002:a17:902:7b88:: with SMTP id w8mr16839946pll.320.1544552482972; Tue, 11 Dec 2018 10:21:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544552482; cv=none; d=google.com; s=arc-20160816; b=y624Rd6xFm6iVSrGTQtKDrRLF2tr8BYAkSH9V9vkBqqtaMd+xXXJy14ERfiBr1Wx1L 7wNR2/zNB/Ycf4EagH+dDJd1/A5ujlz1k/rVQhBBB9c9I00it7zN6HcP7P37cS2PGF3L UjXyk8k9c+jYttoL6WHjZZzlZ5ISRpJFLCy9IA/Y4d8bEQ/wqe7b9IFy7h7L9iBiq94d p2aDE/PIdzRhOgJa9Byjy1WfbVTlrqekcXavQZAvVSkokA3HSBt7K9U7yIQF4WfXIPL1 mT2NrGbojNAg3Us+S4I5u4s8sxdxgqlXNuBha1W83Fuq7dOAGBSTekLXzaqx0TknGTxw mvNg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Hcxsg0Qv/doAhkJrEMsU5vlZqiammzNtTsmbhvOwL30=; b=0snIdlylqydM7L0/++Ll/GPYXKEGvaQqh9p/pkUWZhqaU3UlrnfpwtEHDbCMQB3aNl 4wEtUoesyyR9PUKHh2hQsqUuC3VJPoQK6hV2c37aGlxjW6KtX6ifT6JV2iE4myzohpjM nw16sbsTCeCYau6cisA4AUvQsscQAVnazQgEe+Ku8cIJbXuma7ZbDnWI/NmB2Wqacv2u RIDWCeuOsypu7is/fkW8Lagix2BVFvf02ceJvinu2H/pjNPbKDKNvN5eUdTbb6rNiSpI xkA/xnA01cLfsNPZL78bcBN37JQhumzJCem/6kainIdjPj5rvoLcduSnQYjfnc7qwwT7 NTOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=Y6e83mUE; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 27si12662064pgp.135.2018.12.11.10.21.22; Tue, 11 Dec 2018 10:21:22 -0800 (PST) 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 header.s=20150623 header.b=Y6e83mUE; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 701206C176; Tue, 11 Dec 2018 18:21:20 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mail.openembedded.org (Postfix) with ESMTP id E68596B067 for ; Tue, 11 Dec 2018 18:20:31 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id m1so2606481wml.2 for ; Tue, 11 Dec 2018 10:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JqXIOtY2rrFloXbPbsYcqI5lJS1gENy1XgbXfbkwKUU=; b=Y6e83mUErQCTJCH+fRKazCna4XoxXBMRQu2dhjQD3uGpAeJs2RL7T0iPzqUz8ATkxs JX8Ln7LpAB5h0OSSTaHYHp6XZuCq6ErfAfcHl5LVz6+OAH4JLUTBR2S30Gpo3JPr8zYm 9AFmhHlcFegkItuoFXDxInAgB4d/Wotj6RHKBlLLioDJQQuhsxmLypxoe4eu1GTB8X3v gqr60FsfGKCG/4r4QgvaPLfR8YoeaXIjwl8Eyi7ccQ5V16GBXhXjo+biajAYDX1nP2dw hXayMDKMs1JO3sSLWxl3qa37EXnty6AFBxRBKAH1M40lFb7b868ndJaH7HoOTCXp52EK 0WWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JqXIOtY2rrFloXbPbsYcqI5lJS1gENy1XgbXfbkwKUU=; b=hA+Zls8aRXN1DoWOck/nE0u7KUR9YISVkue6SYLsOFYv8vfqzluOl90iGmqhaM94ti gHdR72gA/LCbrf/DPTWb/D2BiYfrtKcdA5N6NOSkD4i5cit9KnUn+gG5zrm+JxJ9r30G M7m6XlMN8dz9YkYNO5JanxgFkKoq8ugWHFcBjeok/Mfu0ewQiXXxo3k5OVm4e4UPEah7 /qbFn3hWS/Gg3ObCXDo6vvbwhBg1TeAWZkhZW4AByeXa2/aawQmZaJa1qCDY5Ja08zF7 ZVGU4AWbjrR54zJ3G+Z93SpLSHLAu+A71lyByg4uAMGWNLFFUxF5lw6C9U2U9/W8v8bm fUNg== X-Gm-Message-State: AA+aEWa76+EAP/Lz2tKaTL6S7EvSTSMQL8BYmExwhol//A1RFACjrKj2 GAG4BzCyepcSJ/36cByx+/JpujClKEI= X-Received: by 2002:a7b:c1d7:: with SMTP id a23mr3219580wmj.48.1544552432359; Tue, 11 Dec 2018 10:20:32 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b18sm16253616wrw.83.2018.12.11.10.20.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:20:31 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 11 Dec 2018 18:20:22 +0000 Message-Id: <20181211182025.20381-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181211182025.20381-1-ross.burton@intel.com> References: <20181211182025.20381-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/5] oeqa/sdk: show output if run() fails 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 Use oeqa.utils.subprocesstweak to monkey-patch the subprocess exception so that any output is shown, and remove any explicit try/catch handling that would have hidden this. (From OE-Core rev: 0fcc1f7d1f7d4efc793005e194edc048b0c9d388) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Ross Burton --- meta/lib/oeqa/sdk/cases/buildcpio.py | 3 +++ meta/lib/oeqa/sdk/cases/buildlzip.py | 2 ++ meta/lib/oeqa/sdk/cases/gcc.py | 3 +++ meta/lib/oeqa/sdk/cases/perl.py | 12 ++++++------ meta/lib/oeqa/sdk/cases/python.py | 21 +++++++++------------ meta/lib/oeqa/sdkext/cases/devtool.py | 3 +++ 6 files changed, 26 insertions(+), 18 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index f348ac5d909..6697b12de29 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -2,6 +2,9 @@ import unittest from oeqa.sdk.case import OESDKTestCase from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class BuildCpioTest(OESDKTestCase): td_vars = ['DATETIME'] diff --git a/meta/lib/oeqa/sdk/cases/buildlzip.py b/meta/lib/oeqa/sdk/cases/buildlzip.py index 9d137f30ebf..b57fbbece7f 100644 --- a/meta/lib/oeqa/sdk/cases/buildlzip.py +++ b/meta/lib/oeqa/sdk/cases/buildlzip.py @@ -2,6 +2,8 @@ import unittest from oeqa.sdk.case import OESDKTestCase from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() class BuildLzipTest(OESDKTestCase): td_vars = ['DATETIME'] diff --git a/meta/lib/oeqa/sdk/cases/gcc.py b/meta/lib/oeqa/sdk/cases/gcc.py index b32b01fc241..54c6fc488bc 100644 --- a/meta/lib/oeqa/sdk/cases/gcc.py +++ b/meta/lib/oeqa/sdk/cases/gcc.py @@ -5,6 +5,9 @@ import unittest from oeqa.core.utils.path import remove_safe from oeqa.sdk.case import OESDKTestCase +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class GccCompileTest(OESDKTestCase): td_vars = ['MACHINE'] diff --git a/meta/lib/oeqa/sdk/cases/perl.py b/meta/lib/oeqa/sdk/cases/perl.py index e1d2bc159a0..b8adc5ac72d 100644 --- a/meta/lib/oeqa/sdk/cases/perl.py +++ b/meta/lib/oeqa/sdk/cases/perl.py @@ -1,6 +1,9 @@ import unittest from oeqa.sdk.case import OESDKTestCase +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class PerlTest(OESDKTestCase): def setUp(self): if not (self.tc.hasHostPackage("nativesdk-perl") or @@ -8,9 +11,6 @@ class PerlTest(OESDKTestCase): raise unittest.SkipTest("No perl package in the SDK") def test_perl(self): - try: - cmd = "perl -e '$_=\"Uryyb, jbeyq\"; tr/a-zA-Z/n-za-mN-ZA-M/;print'" - output = self._run(cmd) - self.assertEqual(output, "Hello, world") - except subprocess.CalledProcessError as e: - self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output)) + cmd = "perl -e '$_=\"Uryyb, jbeyq\"; tr/a-zA-Z/n-za-mN-ZA-M/;print'" + output = self._run(cmd) + self.assertEqual(output, "Hello, world") diff --git a/meta/lib/oeqa/sdk/cases/python.py b/meta/lib/oeqa/sdk/cases/python.py index 2254867d455..b9174fadbaa 100644 --- a/meta/lib/oeqa/sdk/cases/python.py +++ b/meta/lib/oeqa/sdk/cases/python.py @@ -1,6 +1,9 @@ import subprocess, unittest from oeqa.sdk.case import OESDKTestCase +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class Python2Test(OESDKTestCase): def setUp(self): if not (self.tc.hasHostPackage("nativesdk-python-core") or @@ -8,12 +11,9 @@ class Python2Test(OESDKTestCase): raise unittest.SkipTest("No python package in the SDK") def test_python2(self): - try: - cmd = "python -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" - output = self._run(cmd) - self.assertEqual(output, "Hello, world\n") - except subprocess.CalledProcessError as e: - self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output)) + cmd = "python -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" + output = self._run(cmd) + self.assertEqual(output, "Hello, world\n") class Python3Test(OESDKTestCase): def setUp(self): @@ -22,9 +22,6 @@ class Python3Test(OESDKTestCase): raise unittest.SkipTest("No python3 package in the SDK") def test_python3(self): - try: - cmd = "python3 -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" - output = self._run(cmd) - self.assertEqual(output, "Hello, world\n") - except subprocess.CalledProcessError as e: - self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output)) + cmd = "python3 -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" + output = self._run(cmd) + self.assertEqual(output, "Hello, world\n") diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py index 0860e8d17cf..d322f86c73e 100644 --- a/meta/lib/oeqa/sdkext/cases/devtool.py +++ b/meta/lib/oeqa/sdkext/cases/devtool.py @@ -9,6 +9,9 @@ from oeqa.sdkext.case import OESDKExtTestCase from oeqa.core.decorator.oeid import OETestID from oeqa.utils.httpserver import HTTPService +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class DevtoolTest(OESDKExtTestCase): @classmethod def setUpClass(cls):