clean on test setup

trackier · Apr 24, 2015 · 8c8fd05 · 8c8fd05
1 parent 4ac1597
commit 8c8fd05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/tests/test_redis/common.py b/tests/test_redis/common.py
@@ -19,7 +19,6 @@
 nc_verbose = int(getenv('T_VERBOSE', 5))
 mbuf = int(getenv('T_MBUF', 512))
 large = int(getenv('T_LARGE', 1000))
-clean = int(getenv('T_CLEAN', 1))
 
 all_redis = [
         RedisServer('127.0.0.1', 2100, '/tmp/r/redis-2100/', CLUSTER_NAME, 'redis-2100'),
@@ -32,6 +31,7 @@
 def setup():
     print 'setup(mbuf=%s, verbose=%s)' %(mbuf, nc_verbose)
     for r in all_redis + [nc]:
+        r.clean()
         r.deploy()
         r.stop()
         r.start()
@@ -40,8 +40,6 @@ def teardown():
     for r in all_redis + [nc]:
         assert(r._alive())
         r.stop()
-        if clean: # TODO: move clean to setup
-            r.clean()
 
 default_kv = {'kkk-%s' % i : 'vvv-%s' % i for i in range(10)}
 

diff --git a/tests/test_redis/test_auth.py b/tests/test_redis/test_auth.py
@@ -23,6 +23,7 @@
 def setup():
     print 'setup(mbuf=%s, verbose=%s)' %(mbuf, nc_verbose)
     for r in all_redis + [nc, nc_badpass, nc_nopass]:
+        r.clean()
         r.deploy()
         r.stop()
         r.start()
@@ -31,8 +32,6 @@ def teardown():
     for r in all_redis + [nc, nc_badpass, nc_nopass]:
         assert(r._alive())
         r.stop()
-        if clean:
-            r.clean()
 
 default_kv = {'kkk-%s' % i : 'vvv-%s' % i for i in range(10)}