fixup! Harmonize behavior between has/hasnt_event

Author: anon

qubesadmin/tools/qvm_shutdown.py

@@ -27,16 +27,8 @@
 import sys
 
 import asyncio
-from typing import Iterable
 
-from qubesadmin.app import QubesBase
-from qubesadmin.vm import QubesVM
-
-try:
-    import qubesadmin.events.utils
-    have_events = True
-except ImportError:
-    have_events = False
+import qubesadmin.events.utils
 import qubesadmin.tools
 import qubesadmin.exc
 
@@ -72,18 +64,6 @@ def failed_domains(vms):
             if not (vm.get_power_state() == 'Halted'
                 or (vm.klass == 'DispVM' and vm.get_power_state() == 'NA'))]
 
-async def _wait_for_shutdown_polling(vms: Iterable[QubesVM], app: QubesBase)\
-        -> None:
-    """Fallback polling coroutine when events are not available."""
-    current_vms = list(vms)
-    while True:
-        current_vms = failed_domains(current_vms)
-        if not current_vms:
-            break
-        app.log.info('Waiting for shutdown: {}'.format(
-            ', '.join([str(vm) for vm in current_vms])))
-        await asyncio.sleep(1)
-
 def main(args=None, app=None):  # pylint: disable=missing-docstring
     args = parser.parse_args(args, app=app)
 
@@ -115,16 +95,11 @@ def main(args=None, app=None):  # pylint: disable=missing-docstring
             # no VM shutdown request succeeded, no sense to try again
             break
 
-        if have_events:
-            wait_coro = qubesadmin.events.utils.wait_for_domain_shutdown(
-                awaiting)
-        else:
-            wait_coro = _wait_for_shutdown_polling(awaiting, args.app)
-
         try:
             # pylint: disable=no-member
             loop.run_until_complete(asyncio.wait_for(
-                wait_coro, args.timeout))
+                qubesadmin.events.utils.wait_for_domain_shutdown(
+                    awaiting), args.timeout))
         except (TimeoutError, asyncio.TimeoutError):
             if not args.dry_run:
                 current_vms = failed_domains(awaiting)