Skip to content

Commit 4ab4840

Browse files
Merge pull request ClickHouse#78779 from ClickHouse/slightly-better-test
Prevent `test_replicated_database/test.py::test_create_replicated_table` from being flaky
2 parents c5d68ad + 055b4c7 commit 4ab4840

File tree

1 file changed

+12
-12
lines changed
  • tests/integration/test_replicated_database

1 file changed

+12
-12
lines changed

tests/integration/test_replicated_database/test.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,41 +94,41 @@ def started_cluster():
9494

9595
def test_flatten_nested(started_cluster):
9696
main_node.query(
97-
"CREATE DATABASE create_replicated_table ENGINE = Replicated('/test/create_replicated_table', 'shard1', 'replica' || '1');"
97+
"CREATE DATABASE flatten_nested ENGINE = Replicated('/test/flatten_nested', 'shard1', 'replica' || '1');"
9898
)
9999
dummy_node.query(
100-
"CREATE DATABASE create_replicated_table ENGINE = Replicated('/test/create_replicated_table', 'shard1', 'replica2');"
100+
"CREATE DATABASE flatten_nested ENGINE = Replicated('/test/flatten_nested', 'shard1', 'replica2');"
101101
)
102102

103103
main_node.query(
104-
"CREATE TABLE create_replicated_table.replicated_table (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree ORDER BY k PARTITION BY toYYYYMM(d);"
104+
"CREATE TABLE flatten_nested.replicated_table (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree ORDER BY k PARTITION BY toYYYYMM(d);"
105105
)
106106

107107
main_node.query(
108-
"CREATE MATERIALIZED VIEW create_replicated_table.mv ENGINE=ReplicatedMergeTree ORDER BY tuple() AS select d, cast([(k, toString(i32))] as Nested(a UInt64, b String)) from create_replicated_table.replicated_table"
108+
"CREATE MATERIALIZED VIEW flatten_nested.mv ENGINE=ReplicatedMergeTree ORDER BY tuple() AS select d, cast([(k, toString(i32))] as Nested(a UInt64, b String)) from flatten_nested.replicated_table"
109109
)
110110

111111
main_node.query(
112-
"CREATE TABLE create_replicated_table.no_flatten (n Nested(a UInt64, b String)) ENGINE=ReplicatedMergeTree ORDER BY tuple();",
112+
"CREATE TABLE flatten_nested.no_flatten (n Nested(a UInt64, b String)) ENGINE=ReplicatedMergeTree ORDER BY tuple();",
113113
settings={"flatten_nested": 0},
114114
)
115115

116116
snapshot_recovering_node.query(
117-
"CREATE DATABASE create_replicated_table ENGINE = Replicated('/test/create_replicated_table', 'shard1', 'replica3');"
117+
"CREATE DATABASE flatten_nested ENGINE = Replicated('/test/flatten_nested', 'shard1', 'replica3');"
118118
)
119119
snapshot_recovering_node.query(
120-
"SYSTEM SYNC DATABASE REPLICA create_replicated_table"
120+
"SYSTEM SYNC DATABASE REPLICA flatten_nested"
121121
)
122122

123123
for node in [dummy_node, snapshot_recovering_node]:
124124
for table in ["replicated_table", "mv", "no_flatten"]:
125125
assert main_node.query(
126-
f"show create create_replicated_table.{table}"
127-
) == node.query(f"show create create_replicated_table.{table}")
126+
f"show create flatten_nested.{table}"
127+
) == node.query(f"show create flatten_nested.{table}")
128128

129-
main_node.query("DROP DATABASE create_replicated_table SYNC")
130-
dummy_node.query("DROP DATABASE create_replicated_table SYNC")
131-
snapshot_recovering_node.query("DROP DATABASE create_replicated_table SYNC")
129+
main_node.query("DROP DATABASE flatten_nested SYNC")
130+
dummy_node.query("DROP DATABASE flatten_nested SYNC")
131+
snapshot_recovering_node.query("DROP DATABASE flatten_nested SYNC")
132132

133133

134134
def test_create_replicated_table(started_cluster):

0 commit comments

Comments
 (0)