From patchwork Mon Dec 1 11:45:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 416420 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DCD5714016B for ; Mon, 1 Dec 2014 22:43:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753222AbaLALnr (ORCPT ); Mon, 1 Dec 2014 06:43:47 -0500 Received: from mail.us.es ([193.147.175.20]:41622 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753021AbaLALnq (ORCPT ); Mon, 1 Dec 2014 06:43:46 -0500 Received: (qmail 7751 invoked from network); 1 Dec 2014 12:43:44 +0100 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 1 Dec 2014 12:43:44 +0100 Received: (qmail 27563 invoked by uid 507); 1 Dec 2014 11:43:44 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus1 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.5/19703. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-103.2/7.5):. Processed in 1.848294 secs); 01 Dec 2014 11:43:44 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus1 X-Spam-Level: X-Spam-Status: No, score=-103.2 required=7.5 tests=BAYES_50,SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: AS12715 87.216.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus1) (127.0.0.1) by us.es with SMTP; 1 Dec 2014 11:43:42 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus1 (F-Secure/fsigk_smtp/412/antivirus1); Mon, 01 Dec 2014 12:43:42 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus1) Received: (qmail 7151 invoked from network); 1 Dec 2014 12:43:42 +0100 Received: from 129.166.216.87.static.jazztel.es (HELO salvia.here) (pneira@us.es@87.216.166.129) by mail.us.es with SMTP; 1 Dec 2014 12:43:42 +0100 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: kaber@trash.net Subject: [PATCH nft 3/5] tests: regression: fix "Listing is broken" instead of output mismatch Date: Mon, 1 Dec 2014 12:45:52 +0100 Message-Id: <1417434354-5782-4-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1417434354-5782-1-git-send-email-pablo@netfilter.org> References: <1417434354-5782-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org If the output string doesn't match the input, indicate that the output mismatches instead of the misleading "Listing is broken". Signed-off-by: Pablo Neira Ayuso --- tests/regression/nft-test.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/regression/nft-test.py b/tests/regression/nft-test.py index e1aec89..9998ab3 100755 --- a/tests/regression/nft-test.py +++ b/tests/regression/nft-test.py @@ -505,15 +505,12 @@ def rule_add(rule, table_list, chain_list, filename, lineno, rule_output, cmd) if not force_all_family_option: return [ret, warning, error, unit_tests] - if rule[0].find(rule_output.split(" ")[0]) > -1: - warning += 1 - print_differences_warning(filename, lineno, - rule[0], rule_output, - cmd) - else: - error += 1 - print_differences_error(filename, lineno, - rule_output, cmd) + + warning += 1 + print_differences_warning(filename, lineno, + rule[0], rule_output, + cmd) + if not force_all_family_option: return [ret, warning, error, unit_tests]