From patchwork Fri May 24 20:02:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shekhar Sharma X-Patchwork-Id: 1105145 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gqZ5LFnB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 459cjF0K57z9s9y for ; Sat, 25 May 2019 06:02:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391669AbfEXUCY (ORCPT ); Fri, 24 May 2019 16:02:24 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:38931 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391612AbfEXUCX (ORCPT ); Fri, 24 May 2019 16:02:23 -0400 Received: by mail-pf1-f196.google.com with SMTP id z26so5921403pfg.6 for ; Fri, 24 May 2019 13:02:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rCQ9d9wUI9wPFeXkbOU++BoIqqQlwNJkrPqP7fZ7AJM=; b=gqZ5LFnBpn/Np5RYvQ7sng0cz1B8y+T+cQNZI5fOyAnoV3zpW6rdpRRMt4Uni34OiV glxJiJ8B11j1ceRQheMCwBf+T8Uox/9nS77O0x2twP4Vts63fmTKmgqFoxxd5ESZZvs+ vqizV29MAQv606RUcRVAsvNWhXq8dN73edXT+0lEKFFElqVYBdFQMJXg50CsWHHOhIGW RnAZbRoKCh/9yXXNwIv5PNjEL2721RzLFdD7xTJgjVuBBdkMnufwXbMvJRajlAA5IpRD wJGACS+MIOSfjBoy/EGNBfaheEcmp3TpIaVQmYbnP1SYRP/tBo9/kDjJO8UPFlWANx9X mcrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rCQ9d9wUI9wPFeXkbOU++BoIqqQlwNJkrPqP7fZ7AJM=; b=CNT2eJ/ChGXFuIjVCv417UTcNDTOS4N9xSTcWuWqjPjXf8JlUNzmVAQaECdMFTJzg9 0KZ/kd31T1Apm8cpFELa1L+o2KHf9GPWwc9kSGRM42D2EFa/+VmkBW4QlUVBYMicesqX nq8li84azPe6Pl/p9MvSKp07FbwWVsS92foVeYi/7CUhAptDhWFILm4SjEin5j0wFAbd 4rYGvXw8aJCQ+65IJ4tXD9YTOKAvpsQAw8TVCmAUgzTZASIRSToFjFmCN6r1tdz7Ev89 BystLY14CBgBo+/c2KfhGGMNiwLI5g+S3z7aI+NNZxwp+Zw4MKFt7coQtC5oztL5pXST TcbA== X-Gm-Message-State: APjAAAXErvzUeUHQMhaGZlv9MsadMQNbJpmDNOqokSn27wMrQEtY6Dai BW10La9TfeeBTfdBWa7l2AtVAhIG X-Google-Smtp-Source: APXvYqzFHQxzPVE0V6ZNomGgCp5UTduyAP3N2JKuzTQW/lCg2OD5ZHFXVsDG1+J6txJSwLSvySj/dQ== X-Received: by 2002:a63:1854:: with SMTP id 20mr105113427pgy.366.1558728142422; Fri, 24 May 2019 13:02:22 -0700 (PDT) Received: from localhost.localdomain ([2405:204:e08c:113f:983f:2b22:f507:ea96]) by smtp.gmail.com with ESMTPSA id t7sm3450858pfh.156.2019.05.24.13.02.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 May 2019 13:02:21 -0700 (PDT) From: Shekhar Sharma To: netfilter-devel@vger.kernel.org Cc: Shekhar Sharma Subject: [PATCH iptables v1] iptables-test.py: fix python3 Date: Sat, 25 May 2019 01:32:06 +0530 Message-Id: <20190524200206.484692-1-shekhar250198@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch converts the 'iptables-test.py' file (iptables/iptables-test.py) to run on both python 2 and python3. Do we need to add an argument for 'version' in the argument parser? Signed-off-by: Shekhar Sharma --- iptables-test.py | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/iptables-test.py b/iptables-test.py index 532dee7..8018b65 100755 --- a/iptables-test.py +++ b/iptables-test.py @@ -10,6 +10,7 @@ # This software has been sponsored by Sophos Astaro # +from __future__ import print_function import sys import os import subprocess @@ -45,8 +46,8 @@ def print_error(reason, filename=None, lineno=None): ''' Prints an error with nice colors, indicating file and line number. ''' - print (filename + ": " + Colors.RED + "ERROR" + - Colors.ENDC + ": line %d (%s)" % (lineno, reason)) + print(filename + ": " + Colors.RED + "ERROR" + + Colors.ENDC + ": line {} ({})".format(lineno, reason)) def delete_rule(iptables, rule, filename, lineno): @@ -79,7 +80,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns): cmd = iptables + " -A " + rule if netns: - cmd = "ip netns exec ____iptables-container-test " + EXECUTEABLE + " " + cmd + cmd = "ip netns exec ____iptables-container-test " + EXECUTEABLE + " {}".format(cmd) ret = execute_cmd(cmd, filename, lineno) @@ -88,7 +89,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns): # if ret: if res == "OK": - reason = "cannot load: " + cmd + reason = "cannot load: {}".format(cmd) print_error(reason, filename, lineno) return -1 else: @@ -96,7 +97,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns): return 0 else: if res == "FAIL": - reason = "should fail: " + cmd + reason = "should fail: {}".format(cmd) print_error(reason, filename, lineno) delete_rule(iptables, rule, filename, lineno) return -1 @@ -119,10 +120,10 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns): command = EBTABLES_SAVE path = os.path.abspath(os.path.curdir) + "/iptables/" + EXECUTEABLE - command = path + " " + command + command = path + " {}".format(command) if netns: - command = "ip netns exec ____iptables-container-test " + command + command = "ip netns exec ____iptables-container-test {}".format(command) args = splitted[1:] proc = subprocess.Popen(command, shell=True, @@ -134,7 +135,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns): # check for segfaults # if proc.returncode == -11: - reason = "iptables-save segfaults: " + cmd + reason = "iptables-save segfaults: {}".format(cmd) print_error(reason, filename, lineno) delete_rule(iptables, rule, filename, lineno) return -1 @@ -142,7 +143,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns): # find the rule matching = out.find(rule_save) if matching < 0: - reason = "cannot find: " + iptables + " -I " + rule + reason = "cannot find: {}".format(iptables) + " -I {}".format(rule) print_error(reason, filename, lineno) delete_rule(iptables, rule, filename, lineno) return -1 @@ -164,16 +165,16 @@ def execute_cmd(cmd, filename, lineno): ''' global log_file if cmd.startswith('iptables ') or cmd.startswith('ip6tables ') or cmd.startswith('ebtables ') or cmd.startswith('arptables '): - cmd = os.path.abspath(os.path.curdir) + "/iptables/" + EXECUTEABLE + " " + cmd + cmd = os.path.abspath(os.path.curdir) + "/iptables/" + EXECUTEABLE + " {}".format(cmd) - print >> log_file, "command: %s" % cmd + print("command: {}".format(cmd), file=log_file) ret = subprocess.call(cmd, shell=True, universal_newlines=True, stderr=subprocess.STDOUT, stdout=log_file) log_file.flush() # generic check for segfaults if ret == -11: - reason = "command segfaults: " + cmd + reason = "command segfaults: {}".format(cmd) print_error(reason, filename, lineno) return ret @@ -232,7 +233,7 @@ def run_test_file(filename, netns): if line[0] == "@": external_cmd = line.rstrip()[1:] if netns: - external_cmd = "ip netns exec ____iptables-container-test " + external_cmd + external_cmd = "ip netns exec ____iptables-container-test {}".format(external_cmd) execute_cmd(external_cmd, filename, lineno) continue @@ -240,7 +241,7 @@ def run_test_file(filename, netns): if line[0] == "%": external_cmd = line.rstrip()[1:] if netns: - external_cmd = "ip netns exec ____iptables-container-test " + EXECUTEABLE + " " + external_cmd + external_cmd = "ip netns exec ____iptables-container-test {}".format(EXECUTEABLE) + " {}".format(external_cmd) execute_cmd(external_cmd, filename, lineno) continue @@ -249,7 +250,7 @@ def run_test_file(filename, netns): continue if len(chain_array) == 0: - print "broken test, missing chain, leaving" + print("broken test, missing chain, leaving") sys.exit() test_passed = True @@ -282,7 +283,7 @@ def run_test_file(filename, netns): if netns: execute_cmd("ip netns del ____iptables-container-test", filename, 0) if total_test_passed: - print filename + ": " + Colors.GREEN + "OK" + Colors.ENDC + print(filename + ": " + Colors.GREEN + "OK" + Colors.ENDC) f.close() return tests, passed @@ -302,7 +303,7 @@ def show_missing(): missing = [test_name(i) for i in libfiles if not test_name(i) in testfiles] - print '\n'.join(missing) + print('\n'.join(missing)) # @@ -336,7 +337,7 @@ def main(): EXECUTEABLE = "xtables-nft-multi" if os.getuid() != 0: - print "You need to be root to run this, sorry" + print("You need to be root to run this, sorry") return os.putenv("XTABLES_LIBDIR", os.path.abspath(EXTENSIONS_PATH)) @@ -351,7 +352,7 @@ def main(): try: log_file = open(LOGFILE, 'w') except IOError: - print "Couldn't open log file %s" % LOGFILE + print("Couldn't open log file {}".format(LOGFILE)) return file_list = [os.path.join(EXTENSIONS_PATH, i) @@ -365,9 +366,9 @@ def main(): passed += file_passed test_files += 1 - print ("%d test files, %d unit tests, %d passed" % - (test_files, tests, passed)) + print("{} test files, {} unit tests, {} passed".format(test_files, tests, passed)) if __name__ == '__main__': main() +