thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 01:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 22.4-tests-fixes

Browse Source
This commit is contained in:
mergify[bot] 2022-04-25 17:30:19 +00:00 committed by GitHub
commit 21238b44a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/Config/ConfigProcessor.cpp
View File

@ -514,7 +514,7 @@ XMLDocumentPtr ConfigProcessor::processConfig(
else else
{ {
/// These embedded files added during build with some cmake magic. /// These embedded files added during build with some cmake magic.
/// Look at the end of programs/sever/CMakeLists.txt. /// Look at the end of programs/server/CMakeLists.txt.
std::string embedded_name; std::string embedded_name;
if (path == "config.xml") if (path == "config.xml")
embedded_name = "embedded.xml"; embedded_name = "embedded.xml";

5
tests/integration/test_storage_postgresql_replica/test.py
View File

@ -697,6 +697,11 @@ def test_abrupt_connection_loss_while_heavy_replication(started_cluster):
def test_abrupt_server_restart_while_heavy_replication(started_cluster): def test_abrupt_server_restart_while_heavy_replication(started_cluster):
# FIXME (kssenii) temporary disabled
if instance.is_built_with_address_sanitizer():
pytest.skip("Temporary disabled (FIXME)")
conn = get_postgres_conn( conn = get_postgres_conn(
ip=started_cluster.postgres_ip, ip=started_cluster.postgres_ip,
port=started_cluster.postgres_port, port=started_cluster.postgres_port,