From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harsha Sharma Subject: [PATCH] tests: xlate: print total no. of testfiles, tests and tests passed Date: Wed, 18 Oct 2017 19:59:44 +0530 Message-ID: <20171018142944.14872-1-harshasharmaiitr@gmail.com> Cc: netfilter-devel@vger.kernel.org, outreachy-kernel@googlegroups.com, Harsha Sharma To: pablo@netfilter.org Return-path: Received: from mail-pf0-f174.google.com ([209.85.192.174]:54236 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751048AbdJROaE (ORCPT ); Wed, 18 Oct 2017 10:30:04 -0400 Received: by mail-pf0-f174.google.com with SMTP id t188so4087162pfd.10 for ; Wed, 18 Oct 2017 07:30:04 -0700 (PDT) Sender: netfilter-devel-owner@vger.kernel.org List-ID: Print errors and total no of tests and tests passed for testfile argument. Print total no. of testfiles, total no. of tests and total no. of tests passed for "all" argument. Change testfile argument to take "extensions/test_file" as argument. Signed-off-by: Harsha Sharma --- xlate-test.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/xlate-test.py b/xlate-test.py index 43c4be19..9927ac9c 100755 --- a/xlate-test.py +++ b/xlate-test.py @@ -9,7 +9,6 @@ from subprocess import Popen, PIPE keywords = ("iptables-translate", "ip6tables-translate") - if sys.stdout.isatty(): colors = {"magenta": "\033[95m", "green": "\033[92m", "yellow": "\033[93m", "red": "\033[91m", "end": "\033[0m"} @@ -35,11 +34,14 @@ def green(string): def run_test(name, payload): test_passed = True + tests = 0 + passed = 0 result = [] result.append(yellow("## " + name.replace(".txlate", ""))) for line in payload: if line.startswith(keywords): + tests += 1 process = Popen(shlex.split(line), stdout=PIPE, stderr=PIPE) (output, error) = process.communicate() if process.returncode == 0: @@ -52,9 +54,12 @@ def run_test(name, payload): result.append(magenta("res: ") + translation + "\n") test_passed = False elif args.all: + passed += 1 result.append(green("Ok")) result.append(magenta("src: ") + line.rstrip(" \n")) result.append(magenta("res: ") + translation + "\n") + elif args.test: + passed += 1 else: test_passed = False result.append(red("Error: ") + "iptables-translate failure") @@ -62,14 +67,25 @@ def run_test(name, payload): if not test_passed or args.all: print("\n".join(result)) + if args.test: + print("1 test file, %d tests, %d tests passed" % (tests, passed)) + else: + return tests, passed def load_test_files(): + test_files = 0 + total_tests = 0 + total_passed = 0 for test in sorted(os.listdir("extensions")): if test.endswith(".txlate"): with open("extensions/" + test, "r") as payload: - run_test(test, payload) - + tests, passed = run_test(test, payload) + test_files += 1 + total_tests += tests + total_passed += passed + if args.all: + print("%d test file, %d tests, %d tests passed" % (test_files, total_tests, total_passed)) def main(): if os.getuid() != 0: @@ -78,7 +94,7 @@ def main(): if not args.test.endswith(".txlate"): args.test += ".txlate" try: - with open("extensions/" + args.test, "r") as payload: + with open(args.test, "r") as payload: run_test(args.test, payload) except IOError: print(red("Error: ") + "test file does not exist") -- 2.11.0