thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 09:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed test_system_merges to correctly check replicated node set.

Browse Source
This commit is contained in:
Vladimir Chebotarev 2019-12-07 13:35:13 +03:00
parent 1513e5a854
commit ed2ec2d15d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbms/tests/integration/test_system_merges/test.py
View File

@ -41,10 +41,10 @@ def test_merge_simple(started_cluster, replicated):
clickhouse_path = "/var/lib/clickhouse"
name = "test_merge_simple"
nodes = [node1, node2] if replicated else [node1]
engines = ["ReplicatedMergeTree('/clickhouse/test_merge_simple', '{replica}')"] if replicated else ["MergeTree()"]
engine = "ReplicatedMergeTree('/clickhouse/test_merge_simple', '{replica}')" if replicated else "MergeTree()"
node_check = nodes[-1]
for node, engine in zip(nodes, engines):
for node in nodes:
node.query("""
CREATE TABLE {name}
(
@ -61,6 +61,8 @@ def test_merge_simple(started_cluster, replicated):
def optimize():
node1.query("OPTIMIZE TABLE {name}".format(name=name))
wait = threading.Thread(target=time.sleep, args=(5,))
wait.start()
t = threading.Thread(target=optimize)
t.start()
@ -83,6 +85,7 @@ def test_merge_simple(started_cluster, replicated):
]
]
t.join()
wait.join()
assert node_check.query("SELECT * FROM system.merges WHERE table = '{name}'".format(name=name)) == ""
@ -100,10 +103,10 @@ def test_mutation_simple(started_cluster, replicated):
clickhouse_path = "/var/lib/clickhouse"
name = "test_mutation_simple"
nodes = [node1, node2] if replicated else [node1]
engines = ["ReplicatedMergeTree('/clickhouse/test_merge_simple', '{replica}')"] if replicated else ["MergeTree()"]
engine = "ReplicatedMergeTree('/clickhouse/test_merge_simple', '{replica}')" if replicated else "MergeTree()"
node_check = nodes[-1]
for node, engine in zip(nodes, engines):
for node in nodes:
node.query("""
CREATE TABLE {name}
(