Adding skip logic to few test scenarios

GregBestland · GregBestland · commit 3db3f37ea0ec · 2015-11-02T17:19:31.000-06:00
diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py
@@ -25,6 +25,7 @@
 
 from cassandra import AlreadyExists, SignatureDescriptor, UserFunctionDescriptor, UserAggregateDescriptor
 
+
 from cassandra.cluster import Cluster
 from cassandra.cqltypes import DoubleType, Int32Type, ListType, UTF8Type, MapType, LongType
 from cassandra.encoder import Encoder
@@ -33,10 +34,10 @@
                                 get_schema_parser)
 from cassandra.policies import SimpleConvictionPolicy
 from cassandra.pool import Host
-from cassandra.query import SimpleStatement, ConsistencyLevel
 
+from cassandra.cython_deps import HAVE_CYTHON
 from tests.integration import get_cluster, use_singledc, PROTOCOL_VERSION, get_server_versions, execute_until_pass, \
-    BasicSharedKeyspaceUnitTestCase, BasicSegregatedKeyspaceUnitTestCase, BasicSharedKeyspaceUnitTestCase
+    BasicSegregatedKeyspaceUnitTestCase, BasicSharedKeyspaceUnitTestCase, CASSANDRA_VERSION
 
 
 def setup_module():
@@ -1680,6 +1681,7 @@ def test_return_type_meta(self):
         with self.VerifiedAggregate(self, **self.make_aggregate_kwargs('sum_int', Int32Type, init_cond=1)) as va:
             self.assertIs(self.keyspace_aggregate_meta[va.signature].return_type, Int32Type)
 
+    @unittest.skipUnless(CASSANDRA_VERSION >= '3.0.0', "Skiping until CASSANDRA-10365 is resolved")
     def test_init_cond(self):
         """
         Test to verify that various initial conditions are correctly surfaced in various aggregate functions
@@ -1891,6 +1893,7 @@ def _skip_if_not_version(self, version):
         if CASS_SERVER_VERSION < version:
             raise unittest.SkipTest("Requires server version >= %s" % (version,))
 
+    @unittest.skipIf(CASSANDRA_VERSION >= '3.0.0' and HAVE_CYTHON, "Skiping test due to python-422")
     def test_bad_keyspace(self):
         with patch.object(self.parser_class, '_build_keyspace_metadata_internal', side_effect=self.BadMetaException):
             self.cluster.refresh_keyspace_metadata(self.keyspace_name)
