openstack/neutron
Code Issues Proposed changes

Merge "Fix wrong use of six.moves.queue.get()"

Browse Source
This commit is contained in:
Jenkins
2016-09-22 14:29:58 +00:00
committed by Gerrit Code Review
parent 8d6b7f8635 a01ca10250
commit be8b588b32
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/ovsdb/impl_idl.py
View File

@@ -64,7 +64,7 @@ class Transaction(api.Transaction):
def commit(self): def commit(self):
self.ovsdb_connection.queue_txn(self) self.ovsdb_connection.queue_txn(self)
try: try:
result = self.results.get(self.timeout) result = self.results.get(timeout=self.timeout)
except Queue.Empty: except Queue.Empty:
raise api.TimeoutException( raise api.TimeoutException(
_("Commands %(commands)s exceeded timeout %(timeout)d " _("Commands %(commands)s exceeded timeout %(timeout)d "

6
neutron/tests/unit/agent/ovsdb/test_impl_idl.py
View File

@@ -13,7 +13,6 @@
# under the License. # under the License.
import mock import mock
from six.moves import queue
import testtools import testtools
from neutron.agent.ovsdb import api from neutron.agent.ovsdb import api
@@ -23,10 +22,9 @@ from neutron.tests import base
class TransactionTestCase(base.BaseTestCase): class TransactionTestCase(base.BaseTestCase):
def test_commit_raises_exception_on_timeout(self): def test_commit_raises_exception_on_timeout(self):
with mock.patch.object(queue, 'Queue') as mock_queue:
transaction = impl_idl.NeutronOVSDBTransaction(mock.sentinel, transaction = impl_idl.NeutronOVSDBTransaction(mock.sentinel,
mock.Mock(), 0) mock.Mock(), 1)
mock_queue.return_value.get.side_effect = queue.Empty with self.assert_max_execution_time(10):
with testtools.ExpectedException(api.TimeoutException): with testtools.ExpectedException(api.TimeoutException):
transaction.commit() transaction.commit()