Skip to content

Commit ec3e148

Browse files
committed
handle tc is None and check process.expect
1 parent 0a9366d commit ec3e148

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

tests/system_test.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,19 +1475,18 @@ def find_processes():
14751475

14761476
for process in processes:
14771477
ecode = process.poll()
1478+
if ecode is None:
1479+
continue
14781480
if ecode in (-signal.SIGSEGV, -signal.SIGABRT, 128 + signal.SIGSEGV, 128 + signal.SIGABRT):
1479-
print("process failed")
1481+
print("process crashed")
14801482
process.teardown() # need to get logs!!!
1481-
tc.fail("Subprocess %s failed with ecode %s" % (process.pid, ecode))
1482-
1483-
# for process in processes:
1484-
# pid = process.pid
1485-
# try:
1486-
# # os.kill(pid, 0)
1487-
# pid, ecode = os.waitpid(pid, 0)
1488-
# except OSError:
1489-
# print("process died")
1490-
# process.terminate()
1483+
if tc is not None:
1484+
tc.fail("Subprocess %s failed with ecode %s" % (process.pid, ecode))
1485+
if process.expect == Process.RUNNING or process.expect != ecode:
1486+
print("process stopped or stopped with wrong ecode")
1487+
process.teardown() # need to get logs!!!
1488+
if tc is not None:
1489+
tc.fail("Subprocess %s stopped with ecode %s" % (process.pid, ecode))
14911490

14921491

14931492
class SelfTests(unittest.TestCase):

0 commit comments

Comments
 (0)