Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-20 16:51:37 +00:00
Code Issues Projects Releases Wiki Activity

test: make zdtm.py python2/python3 compatible

Browse source 
Cc: Adrian Reber <areber@redhat.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Andrei Vagin 2018-06-02 00:02:51 +03:00 • committed by Pavel Emelyanov
parent c971d7a97b
commit b4afa08060
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/zdtm.py
View file

@ -32,7 +32,7 @@ prev_line = None
def alarm(*args):
print "==== ALARM ===="
print("==== ALARM ====")
signal.signal(signal.SIGALRM, alarm)
@ -480,14 +480,14 @@ class zdtm_test:
notify_fdout_path = "/proc/%s/fd/%s" % (self.__pid, env['ZDTM_NOTIFY_FDOUT'])
notify_fdin_path = "/proc/%s/fd/%s" % (self.__pid, env['ZDTM_NOTIFY_FDIN'])
print "Send pre-dump notify to %s" % (self.__pid)
print("Send pre-dump notify to %s" % (self.__pid))
with open(notify_fdout_path) as fdout:
with open(notify_fdin_path, "w") as fdin:
fdin.write(struct.pack("i", 0))
fdin.flush()
print "Wait pre-dump notify reply"
print("Wait pre-dump notify reply")
ret = struct.unpack('i', fdout.read(4))
print "Completed pre-dump notify with %d" % (ret)
print("Completed pre-dump notify with %d" % (ret))
def stop(self):
self.__freezer.thaw()
@ -500,7 +500,7 @@ class zdtm_test:
print_sep(self.__name + '.out.inprogress')
print(open(self.__name + '.out.inprogress').read())
print_sep(self.__name + '.out.inprogress')
raise test_fail_exc("result check")
raise test_fail_exc("result check: %s" % list(map(lambda s: s.strip(), res.split())) + res)
def getpid(self):
if self.__pid == 0:
@ -1635,7 +1635,7 @@ class Launcher:
while True:
try:
pid, status = os.waitpid(0, flags)
except OSError, e:
except OSError as e:
if e.errno == errno.EINTR:
subprocess.Popen(["ps", "axf"]).wait()
continue