Skip to content

Commit a4ecd3f

Browse files
committed
handle tc is None and check process.expect
1 parent 1f824f9 commit a4ecd3f

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
@@ -1474,19 +1474,18 @@ def find_processes():
14741474

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

14911490

14921491
class SelfTests(unittest.TestCase):

0 commit comments

Comments
 (0)