Fix test after rebase. [#CLICKHOUSE-312]

dbms/tests/integration/helpers/cluster.py

@@ -84,17 +84,18 @@ class ClickHouseCluster:
         if self.is_up:
             return
 
+        # Kill unstopped containers from previous launch
+        try:
+            subprocess.check_call(self.base_cmd + ['kill'])
+            subprocess.check_call(self.base_cmd + ['down', '--volumes'])
+        except:
+            pass
+
         if destroy_dirs and p.exists(self.instances_dir):
             print "Removing instances dir", self.instances_dir
             shutil.rmtree(self.instances_dir)
 
         for instance in self.instances.values():
-            # Kill unstopped containers from previous launch
-            try:
-                subprocess.check_call(self.base_cmd + ['kill'])
-                subprocess.check_call(self.base_cmd + ['down', '--volumes'])
-            except:
-                pass
             instance.create_dir(destroy_dir=destroy_dirs)
 
         subprocess.check_call(self.base_cmd + ['up', '-d'])

dbms/tests/integration/test_distributed_ddl/test.py

@@ -34,19 +34,19 @@ def ddl_check_there_are_no_dublicates(instance):
 
 
 TEST_REPLICATED_ALTERS=True
-
 cluster = ClickHouseCluster(__file__)
-for i in xrange(4):
-    cluster.add_instance(
-        'ch{}'.format(i+1),
-        config_dir="configs",
-        macroses={"layer": 0, "shard": i/2 + 1, "replica": i%2 + 1},
-        with_zookeeper=True)
 
 
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
+        for i in xrange(4):
+            cluster.add_instance(
+                'ch{}'.format(i+1),
+                config_dir="configs",
+                macroses={"layer": 0, "shard": i/2 + 1, "replica": i%2 + 1},
+                with_zookeeper=True)
+
         cluster.start()
 
         # Initialize databases and service tables