Merge remote-tracking branch 'origin/pr/286'
* 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:
commit
04dcc0da71
@ -233,8 +233,8 @@ class TC_00_Basic(qubes.tests.SystemTestCase):
|
|||||||
# and give a chance for both domain-shutdown handlers to execute
|
# and give a chance for both domain-shutdown handlers to execute
|
||||||
self.loop.run_until_complete(asyncio.sleep(3))
|
self.loop.run_until_complete(asyncio.sleep(3))
|
||||||
# wait for running shutdown handler to complete
|
# wait for running shutdown handler to complete
|
||||||
self.loop.run_until_complete(self.vm.startup_lock.acquire())
|
self.loop.run_until_complete(self.vm._domain_stopped_lock.acquire())
|
||||||
self.vm.startup_lock.release()
|
self.vm._domain_stopped_lock.release()
|
||||||
|
|
||||||
if self.test_failure_reason:
|
if self.test_failure_reason:
|
||||||
self.fail(self.test_failure_reason)
|
self.fail(self.test_failure_reason)
|
||||||
|
@ -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.shutdown(force=True, wait=True))
|
||||||
self.loop.run_until_complete(self.proxy.start())
|
self.loop.run_until_complete(self.proxy.start())
|
||||||
# wait for it to settle down
|
# 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)
|
self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0)
|
||||||
|
|
||||||
def test_113_reattach_after_provider_kill(self):
|
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.kill())
|
||||||
self.loop.run_until_complete(self.proxy.start())
|
self.loop.run_until_complete(self.proxy.start())
|
||||||
# wait for it to settle down
|
# 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)
|
self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0)
|
||||||
|
|
||||||
def test_114_reattach_after_provider_crash(self):
|
def test_114_reattach_after_provider_crash(self):
|
||||||
@ -457,7 +457,7 @@ class VmNetworkingMixin(object):
|
|||||||
'timeout waiting for crash cleanup')
|
'timeout waiting for crash cleanup')
|
||||||
self.loop.run_until_complete(self.proxy.start())
|
self.loop.run_until_complete(self.proxy.start())
|
||||||
# wait for it to settle down
|
# 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)
|
self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0)
|
||||||
|
|
||||||
def test_200_fake_ip_simple(self):
|
def test_200_fake_ip_simple(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user