From bbba912a886c1b2437bfef45511fec7ff83a307e Mon Sep 17 00:00:00 2001 From: GregBestland Date: Wed, 25 Nov 2015 12:15:50 -0600 Subject: [PATCH] skipping bad keyspace metadata until python-440 is resolved --- tests/integration/standard/test_metadata.py | 2 ++ tests/unit/cython/utils.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py index fa9f0374..38a4cecb 100644 --- a/tests/integration/standard/test_metadata.py +++ b/tests/integration/standard/test_metadata.py @@ -36,6 +36,7 @@ from cassandra.pool import Host from tests.integration import get_cluster, use_singledc, PROTOCOL_VERSION, get_server_versions, execute_until_pass, \ BasicSegregatedKeyspaceUnitTestCase, BasicSharedKeyspaceUnitTestCase, drop_keyspace_shutdown_cluster +from tests.unit.cython.utils import notcython def setup_module(): use_singledc() @@ -1906,6 +1907,7 @@ class BadMetaTest(unittest.TestCase): if CASS_SERVER_VERSION < version: raise unittest.SkipTest("Requires server version >= %s" % (version,)) + @notcython 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) diff --git a/tests/unit/cython/utils.py b/tests/unit/cython/utils.py index f8de215c..0d9a4c2b 100644 --- a/tests/unit/cython/utils.py +++ b/tests/unit/cython/utils.py @@ -35,4 +35,5 @@ def cyimport(import_path): # @cythontest # def test_something(self): ... cythontest = unittest.skipUnless(HAVE_CYTHON, 'Cython is not available') -numpytest = unittest.skipUnless(HAVE_CYTHON and HAVE_NUMPY, 'NumPy is not available') +notcython = unittest.skipIf(HAVE_CYTHON, 'Cython not supported') +numpytest = unittest.skipUnless(HAVE_CYTHON and HAVE_NUMPY, 'NumPy is not available')