From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 11CCDA0A02 for ; Mon, 17 May 2021 18:12:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C51840041; Mon, 17 May 2021 18:12:33 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D46F340041 for ; Mon, 17 May 2021 18:12:31 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifr5-0007lX-MW; Mon, 17 May 2021 16:12:31 +0000 From: Christian Ehrhardt To: Thinh Tran Cc: David Christensen , dpdk stable Date: Mon, 17 May 2021 18:07:57 +0200 Message-Id: <20210517161039.3132619-48-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test: fix autotest handling of skipped tests' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/874a929f3bde9d7b3c2252b437ebed44690bef9a Thanks. Christian Ehrhardt --- >From 874a929f3bde9d7b3c2252b437ebed44690bef9a Mon Sep 17 00:00:00 2001 From: Thinh Tran Date: Mon, 2 Mar 2020 15:41:32 -0500 Subject: [PATCH] test: fix autotest handling of skipped tests [ upstream commit c8c3cfd699a117cf8c070059a606ea12ab030cbb ] - When running the default configuration of autotest of the make test it'd take 900 seconds (15 minutes) for the script TIMEOUT and marks Failed for a specific device test that is not supported on the system under test. - Adding the checking for those tests, print out as "Skipped [Not Run]" quickly return and continue for next test Fixes: da0af48a67a5 ("test: add skipped return result") Signed-off-by: Thinh Tran Reviewed-by: David Christensen --- app/test/autotest_test_funcs.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/test/autotest_test_funcs.py b/app/test/autotest_test_funcs.py index 26688b7132..016d99cc24 100644 --- a/app/test/autotest_test_funcs.py +++ b/app/test/autotest_test_funcs.py @@ -12,13 +12,16 @@ import pexpect def default_autotest(child, test_name): child.sendline(test_name) result = child.expect(["Test OK", "Test Failed", - "Command not found", pexpect.TIMEOUT], timeout=900) + "Command not found", pexpect.TIMEOUT, + "Test Skipped"], timeout=900) if result == 1: return -1, "Fail" elif result == 2: return -1, "Fail [Not found]" elif result == 3: return -1, "Fail [Timeout]" + elif result == 4: + return 0, "Skipped [Not Run]" return 0, "Success" # autotest used to run dump commands -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:31.441089413 +0200 +++ 0048-test-fix-autotest-handling-of-skipped-tests.patch 2021-05-17 17:40:29.179809538 +0200 @@ -1 +1 @@ -From c8c3cfd699a117cf8c070059a606ea12ab030cbb Mon Sep 17 00:00:00 2001 +From 874a929f3bde9d7b3c2252b437ebed44690bef9a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c8c3cfd699a117cf8c070059a606ea12ab030cbb ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 0811066cb0..6c717bddb4 100644 +index 26688b7132..016d99cc24 100644 @@ -26 +27 @@ -@@ -13,13 +13,16 @@ import pexpect +@@ -12,13 +12,16 @@ import pexpect