From 8318038a7380d27782db366d724fb9d9e2e685d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 30 Jun 2017 14:18:49 +0200 Subject: [PATCH] tests: workaround asyncio.iscouroutinefunction(Mock)=True It's already fixed in Python 3.5.3, but on Travis we have Python 3.5.2. https://bugs.python.org/issue28703 --- qubes/tests/api_admin.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qubes/tests/api_admin.py b/qubes/tests/api_admin.py index 45b2cffb..bd35c442 100644 --- a/qubes/tests/api_admin.py +++ b/qubes/tests/api_admin.py @@ -1389,6 +1389,7 @@ class TC_00_VMs(AdminAPITestCase): self.vm.add_handler('device-list:testclass', self.device_list_testclass) mock_attach = unittest.mock.Mock() mock_attach.return_value = None + del mock_attach._is_coroutine self.vm.add_handler('device-attach:testclass', mock_attach) with unittest.mock.patch.object(qubes.vm.qubesvm.QubesVM, 'is_halted', lambda _: False): @@ -1405,6 +1406,7 @@ class TC_00_VMs(AdminAPITestCase): self.vm.add_handler('device-list:testclass', self.device_list_testclass) mock_attach = unittest.mock.Mock() mock_attach.return_value = None + del mock_attach._is_coroutine self.vm.add_handler('device-attach:testclass', mock_attach) with unittest.mock.patch.object(qubes.vm.qubesvm.QubesVM, 'is_halted', lambda _: False): @@ -1420,6 +1422,7 @@ class TC_00_VMs(AdminAPITestCase): def test_482_vm_device_attach_not_running(self): self.vm.add_handler('device-list:testclass', self.device_list_testclass) mock_attach = unittest.mock.Mock() + del mock_attach._is_coroutine self.vm.add_handler('device-attach:testclass', mock_attach) with self.assertRaises(qubes.exc.QubesVMNotRunningError): self.call_mgmt_func(b'admin.vm.device.testclass.Attach', @@ -1432,6 +1435,7 @@ class TC_00_VMs(AdminAPITestCase): self.vm.add_handler('device-list:testclass', self.device_list_testclass) mock_attach = unittest.mock.Mock() mock_attach.return_value = None + del mock_attach._is_coroutine self.vm.add_handler('device-attach:testclass', mock_attach) with unittest.mock.patch.object(qubes.vm.qubesvm.QubesVM, 'is_halted', lambda _: False): @@ -1449,6 +1453,7 @@ class TC_00_VMs(AdminAPITestCase): self.vm.add_handler('device-list:testclass', self.device_list_testclass) mock_attach = unittest.mock.Mock() mock_attach.return_value = None + del mock_attach._is_coroutine self.vm.add_handler('device-attach:testclass', mock_attach) value = self.call_mgmt_func(b'admin.vm.device.testclass.Attach', b'test-vm1', b'test-vm1+1234', b'persistent=yes') @@ -1464,6 +1469,7 @@ class TC_00_VMs(AdminAPITestCase): self.vm.add_handler('device-list:testclass', self.device_list_testclass) mock_attach = unittest.mock.Mock() mock_attach.return_value = None + del mock_attach._is_coroutine self.vm.add_handler('device-attach:testclass', mock_attach) with unittest.mock.patch.object(qubes.vm.qubesvm.QubesVM, 'is_halted', lambda _: False): @@ -1482,6 +1488,7 @@ class TC_00_VMs(AdminAPITestCase): self.device_list_attached_testclass) mock_detach = unittest.mock.Mock() mock_detach.return_value = None + del mock_detach._is_coroutine self.vm.add_handler('device-detach:testclass', mock_detach) with unittest.mock.patch.object(qubes.vm.qubesvm.QubesVM, 'is_halted', lambda _: False): @@ -1495,6 +1502,7 @@ class TC_00_VMs(AdminAPITestCase): def test_491_vm_device_detach_not_attached(self): mock_detach = unittest.mock.Mock() mock_detach.return_value = None + del mock_detach._is_coroutine self.vm.add_handler('device-detach:testclass', mock_detach) with unittest.mock.patch.object(qubes.vm.qubesvm.QubesVM, 'is_halted', lambda _: False):