Commit 565498a7 authored by Adrian Reber's avatar Adrian Reber Committed by Andrei Vagin

tests: more python3 compatibility

This makes two zdtm test scripts python3 compatible to run
zdtm on a system without python2.
Signed-off-by: 's avatarAdrian Reber <areber@redhat.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@gmail.com>
parent 12fb7f5a
#!/usr/bin/env python2 #!/usr/bin/env python
import fcntl import fcntl
import tempfile import tempfile
import struct import struct
...@@ -12,8 +12,8 @@ try: ...@@ -12,8 +12,8 @@ try:
fcntl.fcntl(fd.fileno(), F_OFD_SETLK, flock) fcntl.fcntl(fd.fileno(), F_OFD_SETLK, flock)
except IOError as e: except IOError as e:
if e.errno == errno.EINVAL: if e.errno == errno.EINVAL:
print "I/O error({0}): {1}".format(e.errno, e.strerror) print("I/O error({0}): {1}".format(e.errno, e.strerror))
print "OFD locks are not supported." print("OFD locks are not supported.")
exit(1) exit(1)
exit(0) exit(0)
#!/usr/bin/env python2 #!/usr/bin/env python
import sys import sys
sys.path.append("../crit") sys.path.append("../crit")
...@@ -13,13 +13,13 @@ if sys.argv[1] in ["--pre-dump", "--post-restore"]: ...@@ -13,13 +13,13 @@ if sys.argv[1] in ["--pre-dump", "--post-restore"]:
pid = os.getenv("ZDTM_TEST_PID") pid = os.getenv("ZDTM_TEST_PID")
try: try:
subprocess.Popen(["nsenter", "-t", pid, "-n", "ss", "-t", "-a", "-n"]).wait() subprocess.Popen(["nsenter", "-t", pid, "-n", "ss", "-t", "-a", "-n"]).wait()
except OSError, e: except OSError as e:
pass pass
if sys.argv[1] != "--post-restore": if sys.argv[1] != "--post-restore":
sys.exit(0) sys.exit(0)
print "Check TCP images" print("Check TCP images")
def get_sockets(image_dir): def get_sockets(image_dir):
fname = os.path.join(image_dir, "inetsk.img") fname = os.path.join(image_dir, "inetsk.img")
...@@ -34,7 +34,7 @@ def get_sockets(image_dir): ...@@ -34,7 +34,7 @@ def get_sockets(image_dir):
f = open(os.path.join(image_dir, "inetsk.img")) f = open(os.path.join(image_dir, "inetsk.img"))
ids = pycriu.images.load(f) ids = pycriu.images.load(f)
tcp_img = os.path.join(image_dir, "tcp-stream-%x.img" % int(s["ino"])) tcp_img = os.path.join(image_dir, "tcp-stream-%x.img" % int(s["ino"]))
print tcp_img print(tcp_img)
if os.access(tcp_img, os.F_OK): if os.access(tcp_img, os.F_OK):
f = open(tcp_img) f = open(tcp_img)
tcp = pycriu.images.load(f) tcp = pycriu.images.load(f)
...@@ -65,6 +65,6 @@ for d in os.listdir(path): ...@@ -65,6 +65,6 @@ for d in os.listdir(path):
sockets_str = json.dumps(sockets, sys.stdout, indent=8, sort_keys=True) sockets_str = json.dumps(sockets, sys.stdout, indent=8, sort_keys=True)
prev_str = json.dumps(prev, sys.stdout, indent=8, sort_keys=True) prev_str = json.dumps(prev, sys.stdout, indent=8, sort_keys=True)
print "\n".join(difflib.unified_diff(prev_str.split("\n"), sockets_str.split("\n"))) print("\n".join(difflib.unified_diff(prev_str.split("\n"), sockets_str.split("\n"))))
sys.exit(exit_code) sys.exit(exit_code)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment