tools/qvm-run: do not check if DispVM is paused before starting it

DispVM is created on start, so it can't be paused - it doesn't exist
yet.

Fixes: 4a6b5db "qvm-run will unpause paused VMs by defaults"
(cherry picked from commit 6f39533)

qubesadmin/tests/tools/qvm_run.py

@@ -366,9 +366,6 @@ def test_007_run_service_with_gui(self):
         self.assertAllCalled()
 
     def test_008_dispvm_remote(self):
-        self.app.expected_calls[
-            ('$dispvm', 'admin.vm.CurrentState', None, None)] = \
-            b'0\x00power_state=Running'
         ret = qubesadmin.tools.qvm_run.main(
             ['--dispvm', '--service', 'test.service'], app=self.app)
         self.assertEqual(ret, 0)
@@ -383,9 +380,6 @@ def test_008_dispvm_remote(self):
         self.assertAllCalled()
 
     def test_009_dispvm_remote_specific(self):
-        self.app.expected_calls[
-            ('$dispvm:test-vm', 'admin.vm.CurrentState', None, None)] = \
-            b'0\x00power_state=Running'
         ret = qubesadmin.tools.qvm_run.main(
             ['--dispvm=test-vm', '--service', 'test.service'], app=self.app)
         self.assertEqual(ret, 0)
@@ -409,9 +403,6 @@ def test_010_dispvm_local(self):
         self.app.expected_calls[
             ('disp123', 'admin.vm.property.Get', 'qrexec_timeout', None)] = \
             b'0\0default=yes type=int 30'
-        self.app.expected_calls[
-            ('$dispvm', 'admin.vm.CurrentState', None, None)] = \
-            b'0\x00power_state=Running'
         ret = qubesadmin.tools.qvm_run.main(
             ['--dispvm', '--service', 'test.service'], app=self.app)
         self.assertEqual(ret, 0)
@@ -436,9 +427,6 @@ def test_011_dispvm_local_specific(self):
         self.app.expected_calls[
             ('disp123', 'admin.vm.property.Get', 'qrexec_timeout', None)] = \
             b'0\0default=yes type=int 30'
-        self.app.expected_calls[
-            ('$dispvm:test-vm', 'admin.vm.CurrentState', None, None)] = \
-            b'0\x00power_state=Running'
         ret = qubesadmin.tools.qvm_run.main(
             ['--dispvm=test-vm', '--service', 'test.service'], app=self.app)
         self.assertEqual(ret, 0)
@@ -511,9 +499,6 @@ def test_014_dispvm_local_gui(self):
         self.app.expected_calls[
             ('disp123', 'admin.vm.feature.CheckWithTemplate', 'os', None)] = \
             b'2\x00QubesFeatureNotFoundError\x00\x00Feature \'os\' not set\x00'
-        self.app.expected_calls[
-            ('$dispvm', 'admin.vm.CurrentState', None, None)] = \
-            b'0\x00power_state=Running'
         ret = qubesadmin.tools.qvm_run.main(
             ['--dispvm', '--', 'test.command'], app=self.app)
         self.assertEqual(ret, 0)
@@ -542,9 +527,6 @@ def test_015_dispvm_local_no_gui(self):
         self.app.expected_calls[
             ('disp123', 'admin.vm.feature.CheckWithTemplate', 'os', None)] = \
             b'2\x00QubesFeatureNotFoundError\x00\x00Feature \'os\' not set\x00'
-        self.app.expected_calls[
-            ('$dispvm', 'admin.vm.CurrentState', None, None)] = \
-            b'0\x00power_state=Running'
         ret = qubesadmin.tools.qvm_run.main(
             ['--dispvm', '--no-gui', 'test.command'], app=self.app)
         self.assertEqual(ret, 0)

qubesadmin/tools/qvm_run.py

@@ -246,7 +246,7 @@ def main(args=None, app=None):
                                    file=sys.stderr, color=args.color_stderr)
                 retcode = max(retcode, 1)
                 continue
-            if vm.is_paused():
+            if not args.dispvm and vm.is_paused():
                 if not args.autostart:
                     if verbose > 0:
                         print_no_color(