This commit is contained in:
Alexander Tokmakov 2021-03-18 17:22:17 +03:00
parent 0826004353
commit 4ea3178efc
3 changed files with 10 additions and 11 deletions

View File

@ -436,7 +436,7 @@ class ClickhouseIntegrationTestsRunner:
logging.info("Compression finished") logging.info("Compression finished")
test_result = [] test_result = []
for state in ("ERROR", "FAILED", "PASSED"): for state in ("ERROR", "FAILED", "PASSED", "SKIPPED", "FLAKY"):
if state == "PASSED": if state == "PASSED":
text_state = "OK" text_state = "OK"
elif state == "FAILED": elif state == "FAILED":
@ -507,7 +507,7 @@ class ClickhouseIntegrationTestsRunner:
result_state = "success" result_state = "success"
test_result = [] test_result = []
for state in ("ERROR", "FAILED", "PASSED"): for state in ("ERROR", "FAILED", "PASSED", "SKIPPED", "FLAKY"):
if state == "PASSED": if state == "PASSED":
text_state = "OK" text_state = "OK"
elif state == "FAILED": elif state == "FAILED":

View File

@ -93,11 +93,11 @@ def test_load_dictionaries(started_cluster):
def test_invalidate_query(started_cluster): def test_invalidate_query(started_cluster):
conn = get_postgres_conn(database=True) conn = get_postgres_conn(database=True)
cursor = conn.cursor() cursor = conn.cursor()
table_name = 'test1' table_name = 'test0'
create_and_fill_postgres_table(cursor, table_name) create_and_fill_postgres_table(cursor, table_name)
# invalidate query: SELECT value FROM test0 WHERE id = 0 # invalidate query: SELECT value FROM test0 WHERE id = 0
dict_name = 'dict1' dict_name = 'dict0'
create_dict(table_name) create_dict(table_name)
node1.query("SYSTEM RELOAD DICTIONARY {}".format(dict_name)) node1.query("SYSTEM RELOAD DICTIONARY {}".format(dict_name))
assert node1.query("SELECT dictGetUInt32('{}', 'value', toUInt64(0))".format(dict_name)) == "0\n" assert node1.query("SELECT dictGetUInt32('{}', 'value', toUInt64(0))".format(dict_name)) == "0\n"
@ -122,10 +122,10 @@ def test_invalidate_query(started_cluster):
time.sleep(5) time.sleep(5)
assert node1.query("SELECT dictGetUInt32('{}', 'value', toUInt64(0))".format(dict_name)) == '2\n' assert node1.query("SELECT dictGetUInt32('{}', 'value', toUInt64(0))".format(dict_name)) == '2\n'
assert node1.query("SELECT dictGetUInt32('{}', 'value', toUInt64(1))".format(dict_name)) == '2\n' assert node1.query("SELECT dictGetUInt32('{}', 'value', toUInt64(1))".format(dict_name)) == '2\n'
cursor.execute("DROP TABLE IF EXISTS {}".format(table_name))
node1.query("DROP TABLE IF EXISTS {}".format(table_name)) node1.query("DROP TABLE IF EXISTS {}".format(table_name))
node1.query("DROP DICTIONARY IF EXISTS {}".format(dict_name)) node1.query("DROP DICTIONARY IF EXISTS {}".format(dict_name))
cursor.execute("DROP TABLE IF EXISTS {}".format(table_name))
def test_dictionary_with_replicas(started_cluster): def test_dictionary_with_replicas(started_cluster):

View File

@ -71,12 +71,11 @@ def start_cluster():
def test_drop_replica(start_cluster): def test_drop_replica(start_cluster):
for i in range(100): node_1_1.query("INSERT INTO test.test_table SELECT number, toString(number) FROM numbers(100)")
node_1_1.query("INSERT INTO test.test_table VALUES (1, {})".format(i)) node_1_1.query("INSERT INTO test1.test_table SELECT number, toString(number) FROM numbers(100)")
node_1_1.query("INSERT INTO test1.test_table VALUES (1, {})".format(i)) node_1_1.query("INSERT INTO test2.test_table SELECT number, toString(number) FROM numbers(100)")
node_1_1.query("INSERT INTO test2.test_table VALUES (1, {})".format(i)) node_1_1.query("INSERT INTO test3.test_table SELECT number, toString(number) FROM numbers(100)")
node_1_1.query("INSERT INTO test3.test_table VALUES (1, {})".format(i)) node_1_1.query("INSERT INTO test4.test_table SELECT number, toString(number) FROM numbers(100)")
node_1_1.query("INSERT INTO test4.test_table VALUES (1, {})".format(i))
zk = cluster.get_kazoo_client('zoo1') zk = cluster.get_kazoo_client('zoo1')
assert "can't drop local replica" in node_1_1.query_and_get_error("SYSTEM DROP REPLICA 'node_1_1'") assert "can't drop local replica" in node_1_1.query_and_get_error("SYSTEM DROP REPLICA 'node_1_1'")