fixup! add utests

Author: anon

qubesadmin/tests/tools/qvm_shutdown.py

@@ -83,8 +83,6 @@ def test_004_multiple_vms(self):
                                            app=self.app)
         self.assertAllCalled()
 
-    @unittest.skipUnless(qubesadmin.tools.qvm_shutdown.have_events,
-        'Events not present')
     def test_010_wait(self):
         '''test --wait option'''
         loop = asyncio.new_event_loop()
@@ -114,8 +112,6 @@ def test_010_wait(self):
         qubesadmin.tools.qvm_shutdown.main(['--wait', 'some-vm'], app=self.app)
         self.assertAllCalled()
 
-    @unittest.skipUnless(qubesadmin.tools.qvm_shutdown.have_events,
-        'Events not present')
     def test_012_wait_all(self):
         '''test --wait option, with multiple VMs'''
         loop = asyncio.new_event_loop()
@@ -161,8 +157,6 @@ def test_012_wait_all(self):
         qubesadmin.tools.qvm_shutdown.main(['--wait', '--all'], app=self.app)
         self.assertAllCalled()
 
-    @unittest.skipUnless(qubesadmin.tools.qvm_shutdown.have_events,
-        'Events not present')
     def test_015_wait_all_kill_timeout(self):
         '''test --wait option, with multiple VMs and killing on timeout'''
         loop = asyncio.new_event_loop()
@@ -272,8 +266,6 @@ def test_006_dry_run(self):
             ['--dry-run', 'some-vm'], app=self.app)
         self.assertAllCalled()
 
-    @unittest.skipUnless(qubesadmin.tools.qvm_shutdown.have_events,
-        'Events not present')
     def test_011_wait_retry(self):
         '''test --wait retries VMs whose shutdown request failed'''
         loop = asyncio.new_event_loop()
@@ -322,8 +314,6 @@ def test_011_wait_retry(self):
             ['--wait', 'some-vm', 'other-vm'], app=self.app)
         self.assertAllCalled()
 
-    @unittest.skipUnless(qubesadmin.tools.qvm_shutdown.have_events,
-        'Events not present')
     def test_013_wait_all_shutdown_fail(self):
         '''test --wait exits with error when all shutdown requests fail'''
         self.app.expected_calls[
@@ -340,8 +330,6 @@ def test_013_wait_all_shutdown_fail(self):
                 ['--wait', 'some-vm'], app=self.app)
         self.assertAllCalled()
 
-    @unittest.skipUnless(qubesadmin.tools.qvm_shutdown.have_events,
-        'Events not present')
     def test_016_wait_kill_exception(self):
         '''test --wait timeout where kill raises QubesException'''
         loop = asyncio.new_event_loop()
@@ -376,8 +364,6 @@ def test_016_wait_kill_exception(self):
                 ['--wait', '--timeout=1', 'some-vm'], app=self.app)
         self.assertAllCalled()
 
-    @unittest.skipUnless(qubesadmin.tools.qvm_shutdown.have_events,
-        'Events not present')
     def test_017_wait_dispvm_na(self):
         '''test --wait treats DispVM with NA power state as shut down'''
         loop = asyncio.new_event_loop()
@@ -412,24 +398,3 @@ def test_017_wait_dispvm_na(self):
             ['--wait', 'disp123'], app=self.app)
         self.assertAllCalled()
 
-    def test_018_wait_polling_fallback(self):
-        '''test --wait uses polling when events are unavailable'''
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
-
-        self.app.expected_calls[
-            ('dom0', 'admin.vm.List', None, None)] = \
-            b'0\x00some-vm class=AppVM state=Running\n'
-        self.app.expected_calls[
-            ('some-vm', 'admin.vm.Shutdown', None, None)] = \
-            b'0\x00'
-        self.app.expected_calls[
-            ('some-vm', 'admin.vm.CurrentState', None, None)] = [
-            b'0\x00power_state=Halted',
-            b'0\x00power_state=Halted',
-        ]
-        with unittest.mock.patch.object(
-                qubesadmin.tools.qvm_shutdown, 'have_events', False):
-            qubesadmin.tools.qvm_shutdown.main(
-                ['--wait', 'some-vm'], app=self.app)
-        self.assertAllCalled()