Merge remote-tracking branch 'origin/pr/765'

* origin/pr/765:
  Respect shutdown_timeout property on tests

Pull request description:

For: QubesOS/openqa-tests-qubesos#49
For: QubesOS/qubes-issues#1512

---

Failed to shutdown disposable template on Debian:

https://openqa.qubes-os.org/tests/162497#step/system_tests/27

The test does:

- start 2 disposable templates
- shuts down 2 disposable templates

Author: marmarek

qubes/tests/__init__.py

@@ -1405,7 +1405,9 @@ def enter_keys_in_window(self, title, keys):
         ] + keys
         subprocess.check_call(command)
 
-    def shutdown_and_wait(self, vm, force=False, timeout=60):
+    def shutdown_and_wait(self, vm, force=False, timeout=0):
+        if not timeout:
+            timeout = vm.shutdown_timeout
         try:
             self.loop.run_until_complete(
                 vm.shutdown(wait=True, force=force, timeout=timeout)
@@ -1415,8 +1417,10 @@ def shutdown_and_wait(self, vm, force=False, timeout=60):
             del vm
             self.fail("Timeout while waiting for VM {} shutdown".format(name))
 
-    def shutdown_paused(self, vm, timeout=60):
+    def shutdown_paused(self, vm, timeout=0):
         self.loop.run_until_complete(vm.pause())
+        if not timeout:
+            timeout = vm.shutdown_timeout
         with self.assertRaises(qubes.exc.QubesVMNotRunningError):
             self.loop.run_until_complete(
                 vm.shutdown(wait=True, timeout=timeout, force=False)
@@ -1645,7 +1649,7 @@ async def wait_for_session(self, vm):
         if getattr(vm, "template", None) and "whonix-w" in vm.template.name:
             # first boot of whonix-ws takes more time because of /home
             # initialization, including Tor Browser copying
-            timeout = 120
+            timeout = vm.qrexec_timeout
         try:
             await asyncio.wait_for(
                 vm.run_service_for_stdio(