Author: gdusbabek Date: Thu Aug 5 18:24:38 2010 New Revision: 982722 URL: http://svn.apache.org/viewvc?rev=982722&view=rev Log: remove unneccessary keyspaces from nosetests. patch by gdusbabek, reviewed by jbellis. CASSANDRA-1360
Modified: cassandra/trunk/test/system/__init__.py cassandra/trunk/test/system/test_thrift_server.py Modified: cassandra/trunk/test/system/__init__.py URL: http://svn.apache.org/viewvc/cassandra/trunk/test/system/__init__.py?rev=982722&r1=982721&r2=982722&view=diff ============================================================================== --- cassandra/trunk/test/system/__init__.py (original) +++ cassandra/trunk/test/system/__init__.py Thu Aug 5 18:24:38 2010 @@ -164,19 +164,7 @@ class ThriftTester(BaseTester): Cassandra.CfDef('Keyspace2', 'Super4', column_type='Super', subcomparator_type='TimeUUIDType'), ]) - keyspace3 = Cassandra.KsDef('Keyspace3', 'org.apache.cassandra.locator.RackUnawareStrategy', None, 5, - [ - Cassandra.CfDef('Keyspace3', 'Standard1'), - ]) - - keyspace4 = Cassandra.KsDef('Keyspace4', 'org.apache.cassandra.locator.RackUnawareStrategy', None, 3, - [ - Cassandra.CfDef('Keyspace4', 'Standard1'), - Cassandra.CfDef('Keyspace4', 'Standard3'), - Cassandra.CfDef('Keyspace4', 'Super3', column_type='Super', subcomparator_type='BytesType'), - Cassandra.CfDef('Keyspace4', 'Super4', column_type='Super', subcomparator_type='TimeUUIDType') - ]) - for ks in [keyspace1, keyspace2, keyspace3, keyspace4]: + for ks in [keyspace1, keyspace2]: self.client.system_add_keyspace(ks) class AvroTester(BaseTester): Modified: cassandra/trunk/test/system/test_thrift_server.py URL: http://svn.apache.org/viewvc/cassandra/trunk/test/system/test_thrift_server.py?rev=982722&r1=982721&r2=982722&view=diff ============================================================================== --- cassandra/trunk/test/system/test_thrift_server.py (original) +++ cassandra/trunk/test/system/test_thrift_server.py Thu Aug 5 18:24:38 2010 @@ -1108,7 +1108,7 @@ class TestMutations(ThriftTester): def test_describe_keyspace(self): """ Test keyspace description """ kspaces = client.describe_keyspaces() - assert len(kspaces) == 5, kspaces # ['system', 'Keyspace2', 'Keyspace3', 'Keyspace1', 'Keyspace4'] + assert len(kspaces) == 3, kspaces # ['system', 'Keyspace2', 'Keyspace1'] ks1 = client.describe_keyspace("Keyspace1") assert set(ks1.keys()) == set(['Super1', 'Standard1', 'Standard2', 'StandardLong1', 'StandardLong2', 'StandardInteger1', 'Super3', 'Super2', 'Super4', 'Indexed1']) sysks = client.describe_keyspace("system")