aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2019-11-23 15:09:56 (GMT)
committerJouni Malinen <j@w1.fi>2019-11-23 15:09:56 (GMT)
commit9dc07a1d55113afbf0a067d1bdf8f6ae58108006 (patch)
tree1d2118f32b3e53eb2c269cdae3147f96dbbd32d8
parent81121319a9e5cfcd4531fda7ce869b113d79caa0 (diff)
downloadhostap-9dc07a1d55113afbf0a067d1bdf8f6ae58108006.zip
hostap-9dc07a1d55113afbf0a067d1bdf8f6ae58108006.tar.gz
hostap-9dc07a1d55113afbf0a067d1bdf8f6ae58108006.tar.bz2
tests: Fix 'unexpected exit' detection in parallel-vm.py
Now that parallel-vm.py is actually stopping VMs as soon as they are not needed for retries, it is not really an unexpected exit to see a VM exit while test cases remain in the queue as long as at least that many VMs remain running. Get rid of confusing 'unexpected exit' status from the UI in such cases. Fixes: 4aaddecdd85a ("tests: Handle test retries through the same queue") Signed-off-by: Jouni Malinen <j@w1.fi>
-rwxr-xr-xtests/hwsim/vm/parallel-vm.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/hwsim/vm/parallel-vm.py b/tests/hwsim/vm/parallel-vm.py
index 24e4a61..521c13c 100755
--- a/tests/hwsim/vm/parallel-vm.py
+++ b/tests/hwsim/vm/parallel-vm.py
@@ -196,9 +196,14 @@ def show_progress(scr):
logger.info("VM[%d] kernel panic" % i)
updated = True
if test_queue:
- scr.addstr("unexpected exit")
- logger.info("VM[%d] unexpected exit" % i)
- updated = True
+ num_vm = 0
+ for i in range(num_servers):
+ if vm[i]['proc']:
+ num_vm += 1
+ if len(test_queue) > num_vm:
+ scr.addstr("unexpected exit")
+ logger.info("VM[%d] unexpected exit" % i)
+ updated = True
continue
running = True