From 10dfa3eb898da328e26b3c535f9cee96c34da252 Mon Sep 17 00:00:00 2001 From: bjmb Date: Fri, 12 May 2017 13:58:25 -0400 Subject: [PATCH] Removed unused class in test --- tests/integration/__init__.py | 18 ++++-------------- tests/integration/standard/test_metrics.py | 4 ++-- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index 999072e6..32efdd5e 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -681,7 +681,7 @@ class BasicSharedKeyspaceUnitTestCase(BasicKeyspaceUnitTestCase): drop_keyspace_shutdown_cluster(cls.ks_name, cls.session, cls.cluster) -class BasicSharedKeyspaceUnitTestCaseWTable(BasicSharedKeyspaceUnitTestCase): +class BasicSharedKeyspaceUnitTestCaseRF1(BasicSharedKeyspaceUnitTestCase): """ This is basic unit test case that can be leveraged to scope a keyspace to a specific test class. creates a keyspace named after the testclass with a rf of 1, and a table named after the class @@ -701,16 +701,6 @@ class BasicSharedKeyspaceUnitTestCaseRF2(BasicSharedKeyspaceUnitTestCase): self.common_setup(2) -class BasicSharedKeyspaceUnitTestCaseWTable(BasicSharedKeyspaceUnitTestCase): - """ - This is basic unit test case that can be leveraged to scope a keyspace to a specific test class. - creates a keyspace named after the testc lass with a rf of 2, and a table named after the class - """ - @classmethod - def setUpClass(self): - self.common_setup(3, True, True, True) - - class BasicSharedKeyspaceUnitTestCaseRF3(BasicSharedKeyspaceUnitTestCase): """ This is basic unit test case that can be leveraged to scope a keyspace to a specific test class. @@ -721,14 +711,14 @@ class BasicSharedKeyspaceUnitTestCaseRF3(BasicSharedKeyspaceUnitTestCase): self.common_setup(3) -class BasicSharedKeyspaceUnitTestCaseRF3WTable(BasicSharedKeyspaceUnitTestCase): +class BasicSharedKeyspaceUnitTestCaseRF3WM(BasicSharedKeyspaceUnitTestCase): """ This is basic unit test case that can be leveraged to scope a keyspace to a specific test class. - creates a keyspace named after the test class with a rf of 3 and a table named after the class + creates a keyspace named after the test class with a rf of 3 with metrics enabled """ @classmethod def setUpClass(self): - self.common_setup(3, True) + self.common_setup(3, True, True, True) class BasicSharedKeyspaceUnitTestCaseWFunctionTable(BasicSharedKeyspaceUnitTestCase): diff --git a/tests/integration/standard/test_metrics.py b/tests/integration/standard/test_metrics.py index 8882a58b..00642aef 100644 --- a/tests/integration/standard/test_metrics.py +++ b/tests/integration/standard/test_metrics.py @@ -28,7 +28,7 @@ from cassandra.protocol import SyntaxException from cassandra.cluster import Cluster, NoHostAvailable from tests.integration import get_cluster, get_node, use_singledc, PROTOCOL_VERSION, execute_until_pass from greplin import scales -from tests.integration import BasicSharedKeyspaceUnitTestCaseWTable, BasicExistingKeyspaceUnitTestCase, local +from tests.integration import BasicSharedKeyspaceUnitTestCaseRF3WM, BasicExistingKeyspaceUnitTestCase, local def setup_module(): use_singledc() @@ -179,7 +179,7 @@ class MetricsTests(unittest.TestCase): # pass -class MetricsNamespaceTest(BasicSharedKeyspaceUnitTestCaseWTable): +class MetricsNamespaceTest(BasicSharedKeyspaceUnitTestCaseRF3WM): @local def test_metrics_per_cluster(self): """