Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
zdtm: Treat ESRCH from kill() as success.
This fixes failure to clean up after a failed test, where CRIU didn't start properly. ``` ===================== Run zdtm/transition/socket-tcp in h ====================== Start test ./socket-tcp --pidfile=socket-tcp.pid --outfile=socket-tcp.out Traceback (most recent call last): File "/tmp/vex/work/zdtm_py.par/google3/third_party/criu/v3_17/zdtm_py.py", line 1906, in do_run_test cr(cr_api, t, opts) File "/tmp/vex/work/zdtm_py.par/google3/third_party/criu/v3_17/zdtm_py.py", line 1584, in cr cr_api.dump("dump") File "/tmp/vex/work/zdtm_py.par/google3/third_party/criu/v3_17/zdtm_py.py", line 1386, in dump self.__dump_process = self.__criu_act(action, File "/tmp/vex/work/zdtm_py.par/google3/third_party/criu/v3_17/zdtm_py.py", line 1224, in __criu_act raise test_fail_exc("CRIU %s" % action) test_fail_exc: CRIU dump During handling of the above exception, another exception occurred: Traceback (most recent call last): File "<embedded module '_launcher'>", line 182, in run_filename_from_loader_as_main File "<embedded module '_launcher'>", line 34, in _run_code_in_main File "/tmp/vex/work/zdtm_py.par/google3/third_party/criu/v3_17/zdtm_py.py", line 2790, in <module> fork_zdtm() File "/tmp/vex/work/zdtm_py.par/google3/third_party/criu/v3_17/zdtm_py.py", line 2782, in fork_zdtm do_run_test(tinfo[0], tinfo[1], tinfo[2], tinfo[3]) File "/tmp/vex/work/zdtm_py.par/google3/third_party/criu/v3_17/zdtm_py.py", line 1922, in do_run_test t.kill() File "/tmp/vex/work/zdtm_py.par/google3/third_party/criu/v3_17/zdtm_py.py", line 509, in kill os.kill(int(self.__pid), sig) ProcessLookupError: [Errno 3] No such process ``` Signed-off-by: Michał Mirosław <[email protected]>
- Loading branch information