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

Test request id management around authentication

Browse Source 
related to PYTHON-210
This commit is contained in:
Adam Holmberg
2015-01-23 11:57:22 -06:00
parent 81811d2aae
commit 83a79cbfd4
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/integration/standard/test_authentication.py
View File

@@ -14,10 +14,11 @@
import logging import logging
from tests.integration import use_singledc, get_cluster, remove_cluster, PROTOCOL_VERSION
from cassandra.cluster import Cluster, NoHostAvailable from cassandra.cluster import Cluster, NoHostAvailable
from cassandra.auth import PlainTextAuthProvider, SASLClient, SaslAuthProvider from cassandra.auth import PlainTextAuthProvider, SASLClient, SaslAuthProvider
from tests.integration import use_singledc, get_cluster, remove_cluster, PROTOCOL_VERSION
from tests.integration.util import assert_quiescent_pool_state
try: try:
import unittest2 as unittest import unittest2 as unittest
@@ -65,6 +66,7 @@ class AuthenticationTests(unittest.TestCase):
def cluster_as(self, usr, pwd): def cluster_as(self, usr, pwd):
return Cluster(protocol_version=PROTOCOL_VERSION, return Cluster(protocol_version=PROTOCOL_VERSION,
idle_heartbeat_interval=0,
auth_provider=self.get_authentication_provider(username=usr, password=pwd)) auth_provider=self.get_authentication_provider(username=usr, password=pwd))
def test_auth_connect(self): def test_auth_connect(self):
@@ -77,9 +79,11 @@ class AuthenticationTests(unittest.TestCase):
cluster = self.cluster_as(user, passwd) cluster = self.cluster_as(user, passwd)
session = cluster.connect() session = cluster.connect()
self.assertTrue(session.execute('SELECT release_version FROM system.local')) self.assertTrue(session.execute('SELECT release_version FROM system.local'))
assert_quiescent_pool_state(self, cluster)
cluster.shutdown() cluster.shutdown()
root_session.execute('DROP USER %s', user) root_session.execute('DROP USER %s', user)
assert_quiescent_pool_state(self, root_session.cluster)
root_session.cluster.shutdown() root_session.cluster.shutdown()
def test_connect_wrong_pwd(self): def test_connect_wrong_pwd(self):
@@ -88,6 +92,8 @@ class AuthenticationTests(unittest.TestCase):
'.*AuthenticationFailed.*Bad credentials.*Username and/or ' '.*AuthenticationFailed.*Bad credentials.*Username and/or '
'password are incorrect.*', 'password are incorrect.*',
cluster.connect) cluster.connect)
assert_quiescent_pool_state(self, cluster)
cluster.shutdown()
def test_connect_wrong_username(self): def test_connect_wrong_username(self):
cluster = self.cluster_as('wrong_user', 'cassandra') cluster = self.cluster_as('wrong_user', 'cassandra')
@@ -95,6 +101,8 @@ class AuthenticationTests(unittest.TestCase):
'.*AuthenticationFailed.*Bad credentials.*Username and/or ' '.*AuthenticationFailed.*Bad credentials.*Username and/or '
'password are incorrect.*', 'password are incorrect.*',
cluster.connect) cluster.connect)
assert_quiescent_pool_state(self, cluster)
cluster.shutdown()
def test_connect_empty_pwd(self): def test_connect_empty_pwd(self):
cluster = self.cluster_as('Cassandra', '') cluster = self.cluster_as('Cassandra', '')
@@ -102,12 +110,16 @@ class AuthenticationTests(unittest.TestCase):
'.*AuthenticationFailed.*Bad credentials.*Username and/or ' '.*AuthenticationFailed.*Bad credentials.*Username and/or '
'password are incorrect.*', 'password are incorrect.*',
cluster.connect) cluster.connect)
assert_quiescent_pool_state(self, cluster)
cluster.shutdown()
def test_connect_no_auth_provider(self): def test_connect_no_auth_provider(self):
cluster = Cluster(protocol_version=PROTOCOL_VERSION) cluster = Cluster(protocol_version=PROTOCOL_VERSION)
self.assertRaisesRegexp(NoHostAvailable, self.assertRaisesRegexp(NoHostAvailable,
'.*AuthenticationFailed.*Remote end requires authentication.*', '.*AuthenticationFailed.*Remote end requires authentication.*',
cluster.connect) cluster.connect)
assert_quiescent_pool_state(self, cluster)
cluster.shutdown()
class SaslAuthenticatorTests(AuthenticationTests): class SaslAuthenticatorTests(AuthenticationTests):

13
tests/integration/util.py
View File

@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from tests.integration import PROTOCOL_VERSION
def assert_quiescent_pool_state(test_case, cluster): def assert_quiescent_pool_state(test_case, cluster):
for session in cluster.sessions: for session in cluster.sessions:
@@ -22,3 +24,14 @@ def assert_quiescent_pool_state(test_case, cluster):
test_case.assertFalse(state['shutdown']) test_case.assertFalse(state['shutdown'])
test_case.assertGreater(state['open_count'], 0) test_case.assertGreater(state['open_count'], 0)
test_case.assertTrue(all((i == 0 for i in state['in_flights']))) test_case.assertTrue(all((i == 0 for i in state['in_flights'])))
for holder in cluster.get_connection_holders():
for connection in holder.get_connections():
# all ids are unique
req_ids = connection.request_ids
test_case.assertEqual(len(req_ids), len(set(req_ids)))
test_case.assertEqual(connection.highest_request_id, len(req_ids) - 1)
test_case.assertEqual(connection.highest_request_id, max(req_ids))
if PROTOCOL_VERSION < 3:
test_case.assertEqual(connection.highest_request_id, connection.max_request_id)