From patchwork Fri Oct 6 07:15:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 822248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y7gsZ0twBz9t5C for ; Fri, 6 Oct 2017 18:16:00 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 0FF72258; Fri, 6 Oct 2017 07:15:57 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id B47131BB for ; Fri, 6 Oct 2017 07:15:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 53BBECD for ; Fri, 6 Oct 2017 07:15:54 +0000 (UTC) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20171006071551euoutp01ac67b92f6af3a14e903e0bfc62a338c2~q6drfCn2h2775327753euoutp01t for ; Fri, 6 Oct 2017 07:15:51 +0000 (GMT) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20171006071550eucas1p1cb6336df28b1ef6491db6220926c5c1a~q6dqp51c41289512895eucas1p1N; Fri, 6 Oct 2017 07:15:50 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1.samsung.com (EUCPMTA) with SMTP id D7.33.12576.6AD27D95; Fri, 6 Oct 2017 08:15:50 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20171006071550eucas1p234f75585e20f2b02cb94a44ccb0af704~q6dqFP8T62816328163eucas1p2B; Fri, 6 Oct 2017 07:15:49 +0000 (GMT) X-AuditID: cbfec7ef-f79ee6d000003120-b4-59d72da68ece Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id B6.2C.20118.5AD27D95; Fri, 6 Oct 2017 08:15:49 +0100 (BST) Received: from imaximets.rnd.samsung.ru ([106.109.129.180]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OXE00F9Y469H290@eusync3.samsung.com>; Fri, 06 Oct 2017 08:15:49 +0100 (BST) From: Ilya Maximets To: ovs-dev@openvswitch.org Date: Fri, 06 Oct 2017 10:15:42 +0300 Message-id: <1507274142-27044-1-git-send-email-i.maximets@samsung.com> X-Mailer: git-send-email 2.7.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRmVeSWpSXmKPExsWy7djP87rLdK9HGux5LWkx7fNtdosr7T/Z LeZ+es7owOzx7OZ/Ro++LasYA5iiuGxSUnMyy1KL9O0SuDKO7u9gL7jOVbHm61aWBsbtHF2M nBwSAiYSy+Z3MEPYYhIX7q1n62Lk4hASWMYo8fZcJyOE85lR4mvLLhaYjk+L1zLCVU17uZwJ wmlmktjT/oodpIpNQEfi1OojjCC2iIC0xOveN6wgNrNAsMSO9cfYQGxhAVuJyTNegNksAqoS rxpngN3BK+Am0fYOZpucxM1zncwgCyQE9rJKHH7zGepYF4lVN1+zQ9jCEq+Ob4GyZSQuT+5m gWhoZpRoWHWJEcKZwCjxpRnkVpAqe4lTN68yQZzEJzFp23SgqRxAcV6JjjYhiBIPiQ3X9kKV O0pMXXwSbIGQQKzE4lVnmCcwSi1gZFjFKJJaWpybnlpsqFecmFtcmpeul5yfu4kRGFGn/x1/ v4PxaXPIIUYBDkYlHl6JnGuRQqyJZcWVuYcYJTiYlUR43XSuRwrxpiRWVqUW5ccXleakFh9i lOZgURLntY1qixQSSE8sSc1OTS1ILYLJMnFwSjUwTv2W+3n+Da3q9BnGr3a0nwrmmPU7r2Vp 1L/99W+L/+vt4dx7lfN8UYRY1SqmKw2ysa9XrQ22veSWs1YkbE7rk0krN6yyslpUFN6VZnBJ e/GxZSZJWf0pagt7Hpg9DMxenDIh4+Vyy862rLub7p1piLc0t5NoT5mfpDfz7adt+5f6mPl5 rag9rMRSnJFoqMVcVJwIAL2wCL6kAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOJMWRmVeSWpSXmKPExsVy+t/xq7pLda9HGrQdsrSY9vk2u8WV9p/s FnM/PWd0YPZ4dvM/o0ffllWMAUxRXDYpqTmZZalF+nYJXBlH93ewF1znqljzdStLA+N2ji5G Tg4JAROJT4vXMkLYYhIX7q1nA7GFBJYwSjx+pwxhtzJJzL+oAWKzCehInFp9BKxeREBa4nXv G1YQm1kgWOLgsV9gcWEBW4nJM16AzWERUJV41TiDGcTmFXCTaHu3iwVil5zEzXOdzBMYuRcw MqxiFEktLc5Nzy020itOzC0uzUvXS87P3cQI9O62Yz+37GDsehd8iFGAg1GJh7cg71qkEGti WXFl7iFGCQ5mJRFeN53rkUK8KYmVValF+fFFpTmpxYcYpTlYlMR5e/esjhQSSE8sSc1OTS1I LYLJMnFwSjUwNr3/fqVawMpJu+Fq/MmET9+jN2ZrminMqZyR0xDx49izMzL1U6bIP9o35cNO rgpjs11H7Ir7OP+Gy9+Z/en+jvKOz7s2ffj6+V5AmnmEuULf8zYHaTG5x5z1XGt/TV6e+l7y teR3kbPbrLtcz/DFF0Wpm9v4i7FNsio4LKW68gxj0aETvJEblViKMxINtZiLihMBPNlIYuoB AAA= X-CMS-MailID: 20171006071550eucas1p234f75585e20f2b02cb94a44ccb0af704 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?utf-8?q?Ilya_Maximets=1BSRR-Virtualization_Lab=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG0xlYWRpbmcgRW5naW5lZXI=?= X-Global-Sender: =?utf-8?q?Ilya_Maximets=1BSRR-Virtualization_Lab=1BSamsu?= =?utf-8?q?ng_Electronics=1BLeading_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BCISHQ=1BC10GD01GD010154?= CMS-TYPE: 201P X-CMS-RootMailID: 20171006071550eucas1p234f75585e20f2b02cb94a44ccb0af704 X-RootMTR: 20171006071550eucas1p234f75585e20f2b02cb94a44ccb0af704 References: X-Spam-Status: No, score=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ilya Maximets , Heetae Ahn Subject: [ovs-dev] [PATCH] tests: Add timeout to OVS_APP_EXIT_AND_WAIT. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org ovs-appctl can wait indefinitely while executing an exit for a dead service. Let's add a timeout (10 seconds should be reasonable) to exit calls to avoid hanging up of the testsuite in such cases. Signed-off-by: Ilya Maximets --- tests/ovs-macros.at | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at index dbce0a5..54c096c 100644 --- a/tests/ovs-macros.at +++ b/tests/ovs-macros.at @@ -196,8 +196,8 @@ m4_define([OVS_APP_EXIT_AND_WAIT], [AT_CHECK([test -e $OVS_RUNDIR/$1.pid]) TMPPID=$(cat $OVS_RUNDIR/$1.pid) AT_CHECK(m4_if([$1],[ovs-vswitchd], - [ovs-appctl -t $1 exit --cleanup], - [ovs-appctl -t $1 exit])) + [ovs-appctl --timeout=10 -t $1 exit --cleanup], + [ovs-appctl --timeout=10 -t $1 exit])) OVS_WAIT_WHILE([kill -0 $TMPPID 2>/dev/null])]) dnl OVS_APP_EXIT_AND_WAIT_BY_TARGET(TARGET, PIDFILE) @@ -207,7 +207,7 @@ dnl argument), and then wait for it to exit. m4_define([OVS_APP_EXIT_AND_WAIT_BY_TARGET], [AT_CHECK([test -e $2]) TMPPID=$(cat $2) - AT_CHECK([ovs-appctl --target=$1 exit]) + AT_CHECK([ovs-appctl --timeout=10 --target=$1 exit]) OVS_WAIT_WHILE([kill -0 $TMPPID 2>/dev/null])]) dnl on_exit "COMMAND"