Experiment waiting for all preloads to paused

Author: ben-grande

qubes/tests/integ/dispvm.py

@@ -406,30 +406,36 @@ def test_015_dvm_run_preload_race_more(self):
 
     async def _test_preload_wait_pause(self, preload_max):
         """Waiting for pause avoids objects leaking."""
-        for _ in range(100):
+        for _ in range(60):
             if len(self.disp_base.get_feat_preload()) == preload_max:
                 break
             await asyncio.sleep(1)
         else:
             self.fail("didn't preload in time")
-        last_disp_name = self.disp_base.get_feat_preload()[- 1]
-        last_disp = self.app.domains[last_disp_name]
-        for _ in range(50):
-            if last_disp.is_paused():
+        preload_dispvm = self.disp_base.get_feat_preload()
+        preload_unfinished = preload_dispvm
+        for _ in range(60):
+            for qube in preload_unfinished.copy():
+                if self.app.domains[qube].is_paused():
+                    preload_unfinished.remove(qube)
+                    continue
+            if not preload_unfinished:
                 break
             await asyncio.sleep(1)
         else:
             self.fail("last preloaded didn't pause in time")
 
-
     async def _test_015_dvm_run_preload_race_more(self):
         # The limiting factor is how much memory is available on OpenQA and the
         # unreasonable memory allocated before the qube is paused due to:
         #   https://github.com/QubesOS/qubes-issues/issues/9917
-        # Fedora 41, Whonix (Kicksecure) 17 fail with 4 preloaded qubes due to
-        # lack of memory. From the templates deployed by default, only Debian
-        # survives due to using less memory than the other OSes.
-        preload_max = 3
+        # Whonix (Kicksecure) 17 fail more due to memory consumption. From the
+        # templates deployed by default, only Debian and Fedora survives due to
+        # using less memory than the other OSes.
+        preload_max = 4
+        os_dist = self.disp_base.features.check_with_template("os-distribution")
+        if os_dist in ["whonix", "kicksecure"]:
+            preload_max -= 1
         self.disp_base.features["preload-dispvm-max"] = str(preload_max)
         await self._test_preload_wait_pause(preload_max)
         old_preload = self.disp_base.get_feat_preload()