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

* origin/pr/181:
  Improve TestVM and TestVMCollection capabilities
  Fix too-narrow exception caught in qvm_shutdown

qubesadmin/tests/__init__.py

@@ -37,6 +37,9 @@ def __init__(self, name, **kwargs):
     def get_power_state(self):
         return getattr(self, 'power_state', 'Running')
 
+    def is_networked(self):
+        return bool(getattr(self, 'netvm', False))
+
     def __str__(self):
         return self.name
 
@@ -50,6 +53,8 @@ class TestVMCollection(dict):
     def __iter__(self):
         return iter(self.values())
 
+    get_blind = dict.get
+
 
 class TestProcess(object):
     def __init__(self, input_callback=None, stdout=None, stderr=None, stdout_data=None):

qubesadmin/tools/qvm_shutdown.py

@@ -72,7 +72,7 @@ def main(args=None, app=None):  # pylint: disable=missing-docstring
         for vm in this_round_domains:
             try:
                 vm.shutdown(force=force)
-            except qubesadmin.exc.QubesVMNotRunningError:
+            except qubesadmin.exc.QubesVMNotStartedError:
                 pass
             except qubesadmin.exc.QubesException as e:
                 if not args.wait: