openstack
/
ovsdbapp
Code Issues Proposed changes

Merge "Fix functional tests timeout race condition"

This commit is contained in:
Zuul 2018-11-20 17:45:49 +00:00 committed by Gerrit Code Review
parent 0e5904ac9e d85e5b8029
commit c24f00d13d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ovsdbapp/tests/functional/schema/open_vswitch/test_impl_idl.py
View File

@ -197,5 +197,6 @@ class ImplIdlTestCase(base.FunctionalTestCase):
def test_post_commit_vswitchd_incomplete_timeout(self, *args):
# Due to timing issues we may rarely hit the global timeout, which
# raises RuntimeError to match the vsctl implementation
self.api.ovsdb_connection.timeout = 1
mock.patch('ovsdbapp.backend.ovs_idl.transaction.'
'Transaction.timeout_exceeded', return_value=True).start()
self.assertRaises((exc.TimeoutException, RuntimeError), self._add_br)