attempt to fix integration tests

This commit is contained in:
Alexey Zatelepin 2017-07-10 20:34:19 +00:00 committed by alexey-milovidov
parent 57ba50f585
commit 7178fcbb53
3 changed files with 4 additions and 3 deletions

View File

@ -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>

View File

@ -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)

View File

@ -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