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

tests: fix network re-attach tests

Browse Source 
On slow systems (OpenQA), 5s isn't enough. Instead of hardcoding some
timeout, simply wait for the full VM startup.
This commit is contained in:
Marek Marczykowski-Górecki 2019-10-13 05:58:50 +02:00
parent f0ae8c0454
commit a1dabfefa0
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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):