@@ -33,25 +33,30 @@ class BaseCassandraTest(object):
33
33
34
34
def setUp (self ):
35
35
settings = Settings ()
36
- hosts = ['127.0.0.1' ]
37
- port = 9042
36
+ self . hosts = ['127.0.0.1' ]
37
+ self . port = 9042
38
38
self .manager = type ('manager' , (object ,), {})
39
39
self .manager .settings = settings
40
40
self .keyspace = settings .CASSANDRABACKEND_KEYSPACE
41
- timeout = settings .CASSANDRABACKEND_REQUEST_TIMEOUT
42
- cluster = Cluster (hosts , port )
41
+ self . timeout = settings .CASSANDRABACKEND_REQUEST_TIMEOUT
42
+ cluster = Cluster (self . hosts , self . port )
43
43
self .session = cluster .connect ()
44
- if not connection .cluster :
45
- connection .setup (hosts , self .keyspace , port = port )
46
- connection .session .default_timeout = timeout
44
+ self ._set_global_connection (self .hosts , self .port , self .timeout )
47
45
create_keyspace_simple (self .keyspace , 1 )
48
46
self .session .set_keyspace (self .keyspace )
49
- self .session .default_timeout = timeout
47
+ self .session .default_timeout = self . timeout
50
48
connection .session .set_keyspace (self .keyspace )
51
49
52
50
def tearDown (self ):
51
+ self ._set_global_connection (self .hosts , self .port , self .timeout )
53
52
drop_keyspace (self .keyspace )
54
53
self .session .shutdown ()
54
+ connection .unregister_connection ('default' )
55
+
56
+ def _set_global_connection (self , hosts , port , timeout ):
57
+ if not connection .cluster :
58
+ connection .setup (hosts , self .keyspace , port = port )
59
+ connection .session .default_timeout = timeout
55
60
56
61
57
62
class TestCassandraBackendModels (BaseCassandraTest , unittest .TestCase ):
0 commit comments