Remove threshold feature before tests

For: QubesOS/qubes-issues#1512

Author: ben-grande

qubes/tests/integ/dispvm.py

@@ -314,6 +314,9 @@ def cleanup_preload(self):
                 )
             logger.info("deleting global feature")
             del self.app.domains["dom0"].features["preload-dispvm-max"]
+        if "preload-dispvm-threshold" in self.app.domains["dom0"].features:
+            logger.info("deleting global threshold feature")
+            del self.app.domains["dom0"].features["preload-dispvm-threshold"]
         logger.info("end")
 
     async def no_preload(self):
@@ -739,6 +742,10 @@ async def _test_019_preload_refresh(self):
             await self.wait_preload(preload_max)
             old_preload = self.disp_base.get_feat_preload()
             await qube.start()
+            # If services are still starting, it may delay shutdown longer than
+            # the default timeout. Because we can't just kill default
+            # templates, wait gracefully for system services to have started.
+            qube.run_service_for_stdio("qubes.WaitForRunningSystem")
             logger.info("shutdown '%s'", qube.name)
             await qube.shutdown(wait=True)
             await self.wait_preload(preload_max)

tests/dispvm_perf.py

@@ -528,7 +528,12 @@ def run_test(self, test: TestConfig):
                 f"{nogui_prefix} {target} allow\n"
             )
         if test.preload_max:
+            orig_preload_threshold = self.dom0.features.get(
+                "preload-dispvm-threshold"
+            )
             orig_preload_max = self.dom0.features.get("preload-dispvm-max")
+            if orig_preload_threshold is not None:
+                del self.dom0.features["preload-dispvm-threshold"]
             if orig_preload_max is not None:
                 del self.dom0.features["preload-dispvm-max"]
         try:
@@ -552,6 +557,10 @@ def run_test(self, test: TestConfig):
                 old_preload = old_preload.split(" ") or []
                 del self.dvm.features["preload-dispvm-max"]
                 self.wait_for_dispvm_destroy(old_preload)
+                if orig_preload_threshold is not None:
+                    self.dom0.features["preload-dispvm-threshold"] = (
+                        orig_preload_threshold
+                    )
                 if orig_preload_max is not None:
                     self.dom0.features["preload-dispvm-max"] = orig_preload_max
                     if orig_preload_max != 0: