diff options
Diffstat (limited to 'xlate-test.py')
| -rwxr-xr-x | xlate-test.py | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/xlate-test.py b/xlate-test.py index 43c4be19..53b035c7 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,41 +34,56 @@ def green(string): def run_test(name, payload): test_passed = True + tests = passed = failed = errors = 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: translation = output.decode("utf-8").rstrip(" \n") expected = next(payload).rstrip(" \n") if translation != expected: - result.append(red("Fail")) + test_passed = False + failed += 1 + result.append(name + ": " + red("Fail")) result.append(magenta("src: ") + line.rstrip(" \n")) result.append(magenta("exp: ") + expected) result.append(magenta("res: ") + translation + "\n") test_passed = False - elif args.all: - result.append(green("Ok")) - result.append(magenta("src: ") + line.rstrip(" \n")) - result.append(magenta("res: ") + translation + "\n") + else: + passed += 1 else: test_passed = False - result.append(red("Error: ") + "iptables-translate failure") + errors += 1 + result.append(name + ": " + red("Error: ") + "iptables-translate failure") result.append(error.decode("utf-8")) - - if not test_passed or args.all: + if (passed == tests) and not args.test: + print(name + ": " + green("OK")) + if not test_passed: print("\n".join(result)) + if args.test: + print("1 test file, %d tests, %d tests passed, %d tests failed, %d errors" % (tests, passed, failed, errors)) + else: + return tests, passed, failed, errors def load_test_files(): + test_files = total_tests = total_passed = total_error = total_failed = 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, failed, errors = run_test(test, payload) + test_files += 1 + total_tests += tests + total_passed += passed + total_failed += failed + total_error += errors + + print("%d test files, %d tests, %d tests passed, %d tests failed, %d errors" % (test_files, total_tests, total_passed, total_failed, total_error)) def main(): if os.getuid() != 0: @@ -78,7 +92,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") @@ -87,7 +101,6 @@ def main(): parser = argparse.ArgumentParser() -parser.add_argument("--all", action="store_true", help="show also passed tests") parser.add_argument("test", nargs="?", help="run only the specified test file") args = parser.parse_args() main() |