STRLCPY/criu

tests: more python3 compatibility

This makes two zdtm test scripts python3 compatible to run
zdtm on a system without python2.

Signed-off-by: Adrian Reber <[email protected]>
Signed-off-by: Andrei Vagin <[email protected]>

Adrian Reber committed with Andrei Vagin 6 years ago

565498a7

1 parent 12fb7f5a

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

Total 2 files Show one by one

■ ■ ■ ■ ■ ■

test/zdtm/static/file_locks06.checkskip

1		-	#!/usr/bin/env python2
	1	+	#!/usr/bin/env python
2	2		import fcntl
3	3		import tempfile
4	4		import struct
		skipped 7 lines
12	12		fcntl.fcntl(fd.fileno(), F_OFD_SETLK, flock)
13	13		except IOError as e:
14	14		if e.errno == errno.EINVAL:
15		-	print "I/O error({0}): {1}".format(e.errno, e.strerror)
16		-	print "OFD locks are not supported."
	15	+	print("I/O error({0}): {1}".format(e.errno, e.strerror))
	16	+	print("OFD locks are not supported.")
17	17		exit(1)
18	18
19	19		exit(0)
		skipped 1 lines

■ ■ ■ ■ ■ ■

test/zdtm/static/socket-tcp-fin-wait1.hook

1		-	#!/usr/bin/env python2
	1	+	#!/usr/bin/env python
2	2		import sys
3	3
4	4		sys.path.append("../crit")
		skipped 8 lines
13	13		pid = os.getenv("ZDTM_TEST_PID")
14	14		try:
15	15		subprocess.Popen(["nsenter", "-t", pid, "-n", "ss", "-t", "-a", "-n"]).wait()
16		-	except OSError, e:
	16	+	except OSError as e:
17	17		pass
18	18
19	19		if sys.argv[1] != "--post-restore":
20	20		sys.exit(0)
21	21
22		-	print "Check TCP images"
	22	+	print("Check TCP images")
23	23
24	24		def get_sockets(image_dir):
25	25		fname = os.path.join(image_dir, "inetsk.img")
		skipped 8 lines
34	34		f = open(os.path.join(image_dir, "inetsk.img"))
35	35		ids = pycriu.images.load(f)
36	36		tcp_img = os.path.join(image_dir, "tcp-stream-%x.img" % int(s["ino"]))
37		-	print tcp_img
	37	+	print(tcp_img)
38	38		if os.access(tcp_img, os.F_OK):
39	39		f = open(tcp_img)
40	40		tcp = pycriu.images.load(f)
		skipped 24 lines
65	65		sockets_str = json.dumps(sockets, sys.stdout, indent=8, sort_keys=True)
66	66		prev_str = json.dumps(prev, sys.stdout, indent=8, sort_keys=True)
67	67
68		-	print "\n".join(difflib.unified_diff(prev_str.split("\n"), sockets_str.split("\n")))
	68	+	print("\n".join(difflib.unified_diff(prev_str.split("\n"), sockets_str.split("\n"))))
69	69
70	70		sys.exit(exit_code)
71	71