Merge pull request #697 from datastax/errors_jenkins

GregBestland · web-flow · commit c18b15ac5fcb · 2017-01-26T17:12:24.000-06:00
Fixed some tests in jenkins
diff --git a/tests/integration/standard/test_cluster.py b/tests/integration/standard/test_cluster.py
@@ -879,7 +879,7 @@ def test_add_profile_timeout(self):
             self.assertEqual(set(h.address for h in pools), set(('127.0.0.1',)))
 
             node2 = ExecutionProfile(load_balancing_policy=WhiteListRoundRobinPolicy(['127.0.0.2']))
-            self.assertRaises(cassandra.OperationTimedOut, cluster.add_execution_profile, 'node2', node2, pool_wait_timeout=0.0000001)
+            self.assertRaises(cassandra.OperationTimedOut, cluster.add_execution_profile, 'node2', node2, pool_wait_timeout=0.000000001)
 
 
 class LocalHostAdressTranslator(AddressTranslator):
diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py
@@ -37,6 +37,7 @@
     BasicSegregatedKeyspaceUnitTestCase, BasicSharedKeyspaceUnitTestCase, BasicExistingKeyspaceUnitTestCase, drop_keyspace_shutdown_cluster, CASSANDRA_VERSION, \
     BasicExistingSegregatedKeyspaceUnitTestCase, dseonly, DSE_VERSION, get_supported_protocol_versions, greaterthanorequalcass30
 
+from tests.integration import greaterthancass21
 
 def setup_module():
     use_singledc()
@@ -1047,6 +1048,7 @@ def test_export_keyspace_schema_udts(self):
 
         cluster.shutdown()
 
+    @greaterthancass21
     def test_case_sensitivity(self):
         """
         Test that names that need to be escaped in CREATE statements are
diff --git a/tests/integration/standard/test_metrics.py b/tests/integration/standard/test_metrics.py
@@ -363,8 +363,12 @@ def test_metrics_per_cluster(self):
         ra.remove_ra(self.session)
 
         # Make sure a poorly coded RA doesn't cause issues
-        RequestAnalyzer(self.session, throw_on_success=False, throw_on_fail=True)
+        ra = RequestAnalyzer(self.session, throw_on_success=False, throw_on_fail=True)
         self.session.execute("SELECT release_version FROM system.local")
+        
+        ra.remove_ra(self.session)
+
+        RequestAnalyzer(self.session, throw_on_success=True)
         try:
             self.session.execute("nonesense")
         except SyntaxException:
diff --git a/tests/integration/standard/test_query.py b/tests/integration/standard/test_query.py
@@ -83,7 +83,7 @@ def test_row_error_message(self):
         self.session.execute(ss)
         with self.assertRaises(DriverException) as context:
             self.session.execute("SELECT * FROM {0}.{1}".format(self.keyspace_name, self.function_table_name))
-        self.assertIn("Failed decoding result column", context.exception.message)
+        self.assertIn("Failed decoding result column", str(context.exception))
 
     def test_trace_id_to_resultset(self):
 
