Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* origin/pr/286:
  tests: fix network re-attach tests
  tests: fix a fix for too short delay in 201_shutdown_event_race test
This commit is contained in:
Marek Marczykowski-Górecki 2019-10-21 20:48:27 +02:00
commit 04dcc0da71
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubes/tests/integ/basic.py
View File

@ -233,8 +233,8 @@ class TC_00_Basic(qubes.tests.SystemTestCase):
# and give a chance for both domain-shutdown handlers to execute
self.loop.run_until_complete(asyncio.sleep(3))
# wait for running shutdown handler to complete
self.loop.run_until_complete(self.vm.startup_lock.acquire())
self.vm.startup_lock.release()
self.loop.run_until_complete(self.vm._domain_stopped_lock.acquire())
self.vm._domain_stopped_lock.release()
if self.test_failure_reason:
self.fail(self.test_failure_reason)

6
qubes/tests/integ/network.py
View File

@ -417,7 +417,7 @@ class VmNetworkingMixin(object):
self.loop.run_until_complete(self.proxy.shutdown(force=True, wait=True))
self.loop.run_until_complete(self.proxy.start())
# wait for it to settle down
self.loop.run_until_complete(asyncio.sleep(5))
self.loop.run_until_complete(self.wait_for_session(self.proxy))
self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0)
def test_113_reattach_after_provider_kill(self):
@ -433,7 +433,7 @@ class VmNetworkingMixin(object):
self.loop.run_until_complete(self.proxy.kill())
self.loop.run_until_complete(self.proxy.start())
# wait for it to settle down
self.loop.run_until_complete(asyncio.sleep(5))
self.loop.run_until_complete(self.wait_for_session(self.proxy))
self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0)
def test_114_reattach_after_provider_crash(self):
@ -457,7 +457,7 @@ class VmNetworkingMixin(object):
'timeout waiting for crash cleanup')
self.loop.run_until_complete(self.proxy.start())
# wait for it to settle down
self.loop.run_until_complete(asyncio.sleep(5))
self.loop.run_until_complete(self.wait_for_session(self.proxy))
self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0)
def test_200_fake_ip_simple(self):