Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-25 19:14:04 +00:00
Code Issues Projects Releases Wiki Activity

zdtm: open notify file descriptors in a binary mode

Browse source 
Send pre-dump notify to 36
  Traceback (most recent call last):
    File "zdtm.py", line 2161, in <module>
      do_run_test(tinfo[0], tinfo[1], tinfo[2], tinfo[3])
    File "zdtm.py", line 1549, in do_run_test
      cr(cr_api, t, opts)
    File "zdtm.py", line 1264, in cr
      test.pre_dump_notify()
    File "zdtm.py", line 490, in pre_dump_notify
      fdin.write(struct.pack("i", 0))
  TypeError: write() argument 1 must be unicode, not str

Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Andrei Vagin 2018-06-09 20:30:48 +03:00
parent a9e29bc596
commit 5c76d06186
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/zdtm.py
View file

@ -481,8 +481,8 @@ class zdtm_test:
notify_fdin_path = "/proc/%s/fd/%s" % (self.__pid, env['ZDTM_NOTIFY_FDIN'])
print("Send pre-dump notify to %s" % (self.__pid))
with open(notify_fdout_path) as fdout:
with open(notify_fdin_path, "w") as fdin:
with open(notify_fdout_path, "rb") as fdout:
with open(notify_fdin_path, "wb") as fdin:
fdin.write(struct.pack("i", 0))
fdin.flush()
print("Wait pre-dump notify reply")
@ -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: %s" % list(map(lambda s: s.strip(), res.split())) + res)
raise test_fail_exc("result check")
def getpid(self):
if self.__pid == 0: