From: Jouni Malinen <j@w1.fi>
Date: Sat, 23 Nov 2019 15:09:56 +0000 (+0200)
Subject: tests: Fix 'unexpected exit' detection in parallel-vm.py
X-Git-Tag: hostap_2_10~2216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dc07a1d55113afbf0a067d1bdf8f6ae58108006;p=thirdparty%2Fhostap.git

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>
---

diff --git a/tests/hwsim/vm/parallel-vm.py b/tests/hwsim/vm/parallel-vm.py
index 24e4a6194..521c13c86 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