From patchwork Thu Aug 16 16:31:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 958477 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41rsL33lr1z9s8f for ; Fri, 17 Aug 2018 02:31:55 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 472A4CB6; Thu, 16 Aug 2018 16:31:52 +0000 (UTC) X-Original-To: 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 DB13FCB5 for ; Thu, 16 Aug 2018 16:31:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 2B4D4762 for ; Thu, 16 Aug 2018 16:31:50 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 81501E0008; Thu, 16 Aug 2018 16:31:48 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org, blp@ovn.org Date: Thu, 16 Aug 2018 19:31:39 +0300 Message-Id: <20180816163139.16096-1-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH v2] ovn-nbctl test: Add different search string for getopt BSD variant 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 2714. ovn-nbctl.at:1443: testing ovn-nbctl - commands parser error paths fails due to: ovn-nbctl.at:1443: ovn-nbctl --if-exists=foo list Logical_Switch stderr: ovn-nbctl: option '--if-exists=foo' requires an argument ./ovn-nbctl.at:1443: grep 'option .* doesn'\''t allow an argument' stderr stdout: ./ovn-nbctl.at:1443: exit code was 1, expected 0 This is due to the difference between getopt BSD and GNU variant. Signed-off-by: Alin Gabriel Serdean Acked-by: Ben Pfaff Acked-by: Ben Pfaff --- v2: Change grep to egrep and drop the '\|' as suggested by Ben --- tests/ovn-nbctl.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at index 725665b76..a599b1bf7 100644 --- a/tests/ovn-nbctl.at +++ b/tests/ovn-nbctl.at @@ -1484,7 +1484,7 @@ AT_CHECK([grep 'missing argument to .* option' stderr], [0], [ignore]) dnl Unexpected option argument AT_CHECK([ovn-nbctl --if-exists=foo list Logical_Switch], [1], [], [stderr]) -AT_CHECK([grep 'option .* doesn'\''t allow an argument' stderr], [0], [ignore]) +AT_CHECK([egrep 'option .* doesn'\''t allow an argument|option .* requires an argument' stderr], [0], [ignore]) AT_CHECK([ovn-nbctl -- --if-exists=foo list Logical_Switch], [1], [], [stderr]) AT_CHECK([grep 'option on .* does not accept an argument' stderr], [0], [ignore])