Skip to content

Commit c46d62d

Browse files
committed
Wait for preload startup before shutdown
If the system is still starting, slow services may delay the shutdown beyond the default timeout, making the test fail. For: QubesOS/qubes-issues#1512
1 parent 599ef88 commit c46d62d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

qubes/tests/integ/dispvm.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,10 @@ async def _test_019_preload_refresh(self):
742742
await self.wait_preload(preload_max)
743743
old_preload = self.disp_base.get_feat_preload()
744744
await qube.start()
745+
# If services are still starting, it may delay shutdown longer than
746+
# the default timeout. Because we can't just kill default
747+
# templates, wait gracefully for system services to have started.
748+
qube.run_service_for_stdio("qubes.WaitForRunningSystem")
745749
logger.info("shutdown '%s'", qube.name)
746750
await qube.shutdown(wait=True)
747751
await self.wait_preload(preload_max)

0 commit comments

Comments
 (0)