From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: kaber@trash.net
Subject: [PATCH nft 3/4] tests: regression: simplify run_test_file() in case `-e' is used
Date: Sun, 14 Dec 2014 18:01:02 +0100 [thread overview]
Message-ID: <1418576463-3606-4-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1418576463-3606-1-git-send-email-pablo@netfilter.org>
Avoid copy&paste coding style pattern by simplifying the code that
handles the `-e' option that allows us to run known broken tests.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
tests/regression/nft-test.py | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/tests/regression/nft-test.py b/tests/regression/nft-test.py
index dea0f36..7e5b475 100755
--- a/tests/regression/nft-test.py
+++ b/tests/regression/nft-test.py
@@ -692,23 +692,9 @@ def run_test_file(filename, force_all_family_option, specific_file):
continue
if need_fix_option:
rule[0] = rule[0].rstrip()[1:].strip()
- result = rule_add(rule, table_list, chain_list, filename,
- lineno, force_all_family_option)
- tests += 1
- warning = result[1]
- ret = result[0]
- total_warning += warning
- total_error += result[2]
- total_unit_run += result[3]
-
- if ret != 0:
- total_test_passed = False
- elif warning == 0:
- passed += 1
- continue
else:
continue
- if need_fix_option:
+ elif need_fix_option:
continue
result = rule_add(rule, table_list, chain_list, filename, lineno,
--
1.7.10.4
next prev parent reply other threads:[~2014-12-14 16:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-14 17:00 [PATCH nft 0/4] nft updates Pablo Neira Ayuso
2014-12-14 17:01 ` [PATCH nft 1/4] datatype: missing byteorder in string_type Pablo Neira Ayuso
2014-12-14 18:01 ` Patrick McHardy
2014-12-14 19:47 ` Pablo Neira Ayuso
2014-12-15 11:43 ` Pablo Neira Ayuso
2014-12-15 11:51 ` Patrick McHardy
2014-12-15 14:16 ` Patrick McHardy
2014-12-15 17:24 ` Pablo Neira Ayuso
2014-12-14 17:01 ` [PATCH nft 2/4] tests: regression: fix wrong number of test files Pablo Neira Ayuso
2014-12-14 17:01 ` Pablo Neira Ayuso [this message]
2014-12-14 17:01 ` [PATCH nft 4/4] tests: regression: log.t: this works for bridge and arp since 3.17 Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1418576463-3606-4-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).