From 7178fcbb5345f7a81eb2d60804092870a761604d Mon Sep 17 00:00:00 2001
From: Alexey Zatelepin <ztlpn@yandex-team.ru>
Date: Mon, 10 Jul 2017 20:34:19 +0000
Subject: [PATCH] attempt to fix integration tests

---
 dbms/tests/integration/helpers/common_instance_config.xml | 2 +-
 dbms/tests/integration/helpers/network.py                 | 4 ++--
 dbms/tests/integration/test_server_initialization/test.py | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dbms/tests/integration/helpers/common_instance_config.xml b/dbms/tests/integration/helpers/common_instance_config.xml
index 52fab7055e..73ab595ab6 100644
--- a/dbms/tests/integration/helpers/common_instance_config.xml
+++ b/dbms/tests/integration/helpers/common_instance_config.xml
@@ -1,6 +1,6 @@
 <yandex>
     <timezone>Europe/Moscow</timezone>
-    <listen_host>::</listen_host>
+    <listen_host>0.0.0.0</listen_host>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
 </yandex>
diff --git a/dbms/tests/integration/helpers/network.py b/dbms/tests/integration/helpers/network.py
index 0aca77f7ee..59026a8e2e 100644
--- a/dbms/tests/integration/helpers/network.py
+++ b/dbms/tests/integration/helpers/network.py
@@ -90,12 +90,12 @@ class _NetworkManager:
         return cls._instance
 
     def add_iptables_rule(self, **kwargs):
-        cmd = ['iptables', '-A', 'DOCKER']
+        cmd = ['iptables', '-I', 'DOCKER-USER', '1']
         cmd.extend(self._iptables_cmd_suffix(**kwargs))
         self._exec_run(cmd, privileged=True)
 
     def delete_iptables_rule(self, **kwargs):
-        cmd = ['iptables', '-D', 'DOCKER']
+        cmd = ['iptables', '-D', 'DOCKER-USER']
         cmd.extend(self._iptables_cmd_suffix(**kwargs))
         self._exec_run(cmd, privileged=True)
 
diff --git a/dbms/tests/integration/test_server_initialization/test.py b/dbms/tests/integration/test_server_initialization/test.py
index 3b10be6563..212037b0c9 100644
--- a/dbms/tests/integration/test_server_initialization/test.py
+++ b/dbms/tests/integration/test_server_initialization/test.py
@@ -13,6 +13,7 @@ def started_cluster():
         instance_fail = cluster_fail.add_instance('dummy_fail', clickhouse_path_dir='clickhouse_path_fail')
         with pytest.raises(Exception):
             cluster_fail.start()
+        cluster_fail.shutdown() # cleanup
 
         yield cluster