openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Merge pull request #603 from datastax/591

Browse Source 
PYTHON-591 - relax mock requirement, fix some tests
This commit is contained in:
Greg Bestland
2016-07-07 09:53:27 -05:00
committed by GitHub
parent 546ca99cfc 3e876e0a71
commit b6a0a95458
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test-requirements.txt
View File

@@ -1,7 +1,7 @@
-r requirements.txt -r requirements.txt
scales scales
nose nose
mock<=1.0.1 mock!=1.1.*
ccm>=2.0 ccm>=2.0
unittest2 unittest2
PyYAML PyYAML

17
tests/unit/test_host_connection_pool.py
View File

@@ -165,7 +165,8 @@ class HostConnectionPoolTests(unittest.TestCase):
def test_return_defunct_connection(self): def test_return_defunct_connection(self):
host = Mock(spec=Host, address='ip1') host = Mock(spec=Host, address='ip1')
session = self.make_session() session = self.make_session()
conn = NonCallableMagicMock(spec=Connection, in_flight=0, is_defunct=False, is_closed=False, max_request_id=100) conn = NonCallableMagicMock(spec=Connection, in_flight=0, is_defunct=False, is_closed=False,
max_request_id=100, signaled_error=False)
session.cluster.connection_factory.return_value = conn session.cluster.connection_factory.return_value = conn
pool = HostConnectionPool(host, HostDistance.LOCAL, session) pool = HostConnectionPool(host, HostDistance.LOCAL, session)
@@ -177,14 +178,14 @@ class HostConnectionPoolTests(unittest.TestCase):
pool.return_connection(conn) pool.return_connection(conn)
# the connection should be closed a new creation scheduled # the connection should be closed a new creation scheduled
conn.close.assert_called_once() self.assertTrue(session.submit.call_args)
session.submit.assert_called_once()
self.assertFalse(pool.is_shutdown) self.assertFalse(pool.is_shutdown)
def test_return_defunct_connection_on_down_host(self): def test_return_defunct_connection_on_down_host(self):
host = Mock(spec=Host, address='ip1') host = Mock(spec=Host, address='ip1')
session = self.make_session() session = self.make_session()
conn = NonCallableMagicMock(spec=Connection, in_flight=0, is_defunct=False, is_closed=False, max_request_id=100, signaled_error=False) conn = NonCallableMagicMock(spec=Connection, in_flight=0, is_defunct=False, is_closed=False,
max_request_id=100, signaled_error=False)
session.cluster.connection_factory.return_value = conn session.cluster.connection_factory.return_value = conn
pool = HostConnectionPool(host, HostDistance.LOCAL, session) pool = HostConnectionPool(host, HostDistance.LOCAL, session)
@@ -196,15 +197,15 @@ class HostConnectionPoolTests(unittest.TestCase):
pool.return_connection(conn) pool.return_connection(conn)
# the connection should be closed a new creation scheduled # the connection should be closed a new creation scheduled
session.cluster.signal_connection_failure.assert_called_once() self.assertTrue(session.cluster.signal_connection_failure.call_args)
conn.close.assert_called_once() self.assertTrue(conn.close.call_args)
self.assertFalse(session.submit.called) self.assertFalse(session.submit.called)
self.assertTrue(pool.is_shutdown) self.assertTrue(pool.is_shutdown)
def test_return_closed_connection(self): def test_return_closed_connection(self):
host = Mock(spec=Host, address='ip1') host = Mock(spec=Host, address='ip1')
session = self.make_session() session = self.make_session()
conn = NonCallableMagicMock(spec=Connection, in_flight=0, is_defunct=False, is_closed=True, max_request_id=100) conn = NonCallableMagicMock(spec=Connection, in_flight=0, is_defunct=False, is_closed=True, max_request_id=100, signaled_error=False)
session.cluster.connection_factory.return_value = conn session.cluster.connection_factory.return_value = conn
pool = HostConnectionPool(host, HostDistance.LOCAL, session) pool = HostConnectionPool(host, HostDistance.LOCAL, session)
@@ -216,7 +217,7 @@ class HostConnectionPoolTests(unittest.TestCase):
pool.return_connection(conn) pool.return_connection(conn)
# a new creation should be scheduled # a new creation should be scheduled
session.submit.assert_called_once() self.assertTrue(session.submit.call_args)
self.assertFalse(pool.is_shutdown) self.assertFalse(pool.is_shutdown)
def test_host_instantiations(self): def test_host_instantiations(self):

2
tests/unit/test_response_future.py
View File

@@ -480,7 +480,7 @@ class ResponseFutureTests(unittest.TestCase):
result = Mock(spec=PreparedQueryNotFound, info='a' * 16) result = Mock(spec=PreparedQueryNotFound, info='a' * 16)
rf._set_result(result) rf._set_result(result)
session.submit.assert_called_once() self.assertTrue(session.submit.call_args)
args, kwargs = session.submit.call_args args, kwargs = session.submit.call_args
self.assertEqual(rf._reprepare, args[-2]) self.assertEqual(rf._reprepare, args[-2])
self.assertIsInstance(args[-1], PrepareMessage) self.assertIsInstance(args[-1], PrepareMessage)