From dbb29dd3944be9af6e809086b4134a9d58ea33b4 Mon Sep 17 00:00:00 2001 From: avogar Date: Mon, 28 Feb 2022 12:17:44 +0000 Subject: [PATCH] Fix tests --- tests/clickhouse-test | 2 +- tests/queries/0_stateless/00505_secure.sh | 1 + tests/queries/0_stateless/01339_client_unrecognized_option.sh | 2 +- .../1_stateful/00168_parallel_processing_on_replicas_part_1.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/clickhouse-test b/tests/clickhouse-test index a729a216f9a..a990e0c2986 100755 --- a/tests/clickhouse-test +++ b/tests/clickhouse-test @@ -447,7 +447,7 @@ class TestCase: os.environ['CLICKHOUSE_URL_PARAMS'] = self.base_url_params + '&' + '&'.join(self.random_settings) new_options = " --" + " --".join(self.random_settings) - os.environ['CLICKHOUSE_CLIENT_OPT'] = self.base_client_options + new_options + os.environ['CLICKHOUSE_CLIENT_OPT'] = self.base_client_options + new_options + ' ' return client_options + new_options def remove_random_settings_from_env(self): diff --git a/tests/queries/0_stateless/00505_secure.sh b/tests/queries/0_stateless/00505_secure.sh index e69515253ed..a8bc2a0f44a 100755 --- a/tests/queries/0_stateless/00505_secure.sh +++ b/tests/queries/0_stateless/00505_secure.sh @@ -7,6 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) # shellcheck source=../shell_config.sh . "$CURDIR"/../shell_config.sh +echo $CLICKHOUSE_CLIENT_SECURE $CLICKHOUSE_CLIENT_SECURE -q "SELECT 2;" #disable test diff --git a/tests/queries/0_stateless/01339_client_unrecognized_option.sh b/tests/queries/0_stateless/01339_client_unrecognized_option.sh index 00c153ec915..9f827ccb13e 100755 --- a/tests/queries/0_stateless/01339_client_unrecognized_option.sh +++ b/tests/queries/0_stateless/01339_client_unrecognized_option.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Tags: no-fasttest +# Tags: no-fasttest, no-random-settings CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) # shellcheck source=../shell_config.sh diff --git a/tests/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.sh b/tests/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.sh index 699700bcd3e..4b1a03e8722 100755 --- a/tests/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.sh +++ b/tests/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Tags: no-tsan +# Tags: no-tsan, no-ranfom-settings CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) # shellcheck source=../shell_config.sh