From 999b181aa52eb7c7f8a3a16d1bae412d1bb5e8fc Mon Sep 17 00:00:00 2001 From: proller Date: Wed, 21 Dec 2016 23:43:35 +0300 Subject: [PATCH] fix 'env bash -e' --- dbms/tests/queries/0_stateless/00058_global_in.sh | 5 ++++- .../queries/0_stateless/00090_union_race_conditions_1.sh | 5 ++++- .../queries/0_stateless/00091_union_race_conditions_2.sh | 5 ++++- .../queries/0_stateless/00092_union_race_conditions_3.sh | 5 ++++- .../queries/0_stateless/00093_union_race_conditions_4.sh | 5 ++++- .../queries/0_stateless/00094_union_race_conditions_5.sh | 5 ++++- .../queries/0_stateless/00095_union_race_conditions_6.sh | 5 ++++- dbms/tests/queries/0_stateless/00115_in_incomplete_result.sh | 5 ++++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dbms/tests/queries/0_stateless/00058_global_in.sh b/dbms/tests/queries/0_stateless/00058_global_in.sh index cde01ae0942..6a17d0e0247 100755 --- a/dbms/tests/queries/0_stateless/00058_global_in.sh +++ b/dbms/tests/queries/0_stateless/00058_global_in.sh @@ -1,4 +1,7 @@ -#!/usr/bin/env bash -e +#!/usr/bin/env bash + +set -o errexit +set -o pipefail # Скрипт довольно хрупкий. diff --git a/dbms/tests/queries/0_stateless/00090_union_race_conditions_1.sh b/dbms/tests/queries/0_stateless/00090_union_race_conditions_1.sh index 2dc1904e37d..96ef75f0fdd 100755 --- a/dbms/tests/queries/0_stateless/00090_union_race_conditions_1.sh +++ b/dbms/tests/queries/0_stateless/00090_union_race_conditions_1.sh @@ -1,4 +1,7 @@ -#!/usr/bin/env bash -e +#!/usr/bin/env bash + +set -o errexit +set -o pipefail echo " DROP TABLE IF EXISTS test.two_blocks; diff --git a/dbms/tests/queries/0_stateless/00091_union_race_conditions_2.sh b/dbms/tests/queries/0_stateless/00091_union_race_conditions_2.sh index 7edf82f35f3..73647df4538 100755 --- a/dbms/tests/queries/0_stateless/00091_union_race_conditions_2.sh +++ b/dbms/tests/queries/0_stateless/00091_union_race_conditions_2.sh @@ -1,3 +1,6 @@ -#!/usr/bin/env bash -e +#!/usr/bin/env bash + +set -o errexit +set -o pipefail for i in {1..10}; do seq 1 100 | sed 's/.*/SELECT count() FROM (SELECT * FROM (SELECT * FROM system.numbers_mt LIMIT 111) LIMIT 55);/' | clickhouse-client -n --receive_timeout=1 --max_block_size=1 | grep -vE '^55$' && echo 'Fail!' && break; echo -n '.'; done; echo diff --git a/dbms/tests/queries/0_stateless/00092_union_race_conditions_3.sh b/dbms/tests/queries/0_stateless/00092_union_race_conditions_3.sh index 5c968f1e27a..d400afb2fc9 100755 --- a/dbms/tests/queries/0_stateless/00092_union_race_conditions_3.sh +++ b/dbms/tests/queries/0_stateless/00092_union_race_conditions_3.sh @@ -1,3 +1,6 @@ -#!/usr/bin/env bash -e +#!/usr/bin/env bash + +set -o errexit +set -o pipefail for i in {1..10}; do seq 1 100 | sed 's/.*/SELECT * FROM (SELECT * FROM system.numbers_mt LIMIT 111) LIMIT 55;/' | clickhouse-client -n --receive_timeout=1 --max_block_size=1 | wc -l | grep -vE '^5500$' && echo 'Fail!' && break; echo -n '.'; done; echo diff --git a/dbms/tests/queries/0_stateless/00093_union_race_conditions_4.sh b/dbms/tests/queries/0_stateless/00093_union_race_conditions_4.sh index 9c80be54a5c..8db5d2426e7 100755 --- a/dbms/tests/queries/0_stateless/00093_union_race_conditions_4.sh +++ b/dbms/tests/queries/0_stateless/00093_union_race_conditions_4.sh @@ -1,3 +1,6 @@ -#!/usr/bin/env bash -e +#!/usr/bin/env bash + +set -o errexit +set -o pipefail for i in {1..10}; do seq 1 10 | sed 's/.*/SELECT 1 % ((number + 500) % 1000) FROM system.numbers_mt LIMIT 1000;/' | clickhouse-client -n --receive_timeout=1 --max_block_size=1 >/dev/null 2>&1 && echo 'Fail!' && break; echo -n '.'; done; echo diff --git a/dbms/tests/queries/0_stateless/00094_union_race_conditions_5.sh b/dbms/tests/queries/0_stateless/00094_union_race_conditions_5.sh index ab0c984a09e..0bbb39b8acb 100755 --- a/dbms/tests/queries/0_stateless/00094_union_race_conditions_5.sh +++ b/dbms/tests/queries/0_stateless/00094_union_race_conditions_5.sh @@ -1,3 +1,6 @@ -#!/usr/bin/env bash -e +#!/usr/bin/env bash + +set -o errexit +set -o pipefail for i in {1..10}; do seq 1 100 | sed 's/.*/SELECT * FROM system.numbers_mt LIMIT 111;/' | clickhouse-client -n --receive_timeout=1 --max_block_size=$(($RANDOM % 123 + 1)) | wc -l | grep -vE '^11100$' && echo 'Fail!' && break; echo -n '.'; done; echo diff --git a/dbms/tests/queries/0_stateless/00095_union_race_conditions_6.sh b/dbms/tests/queries/0_stateless/00095_union_race_conditions_6.sh index 062b1cb7025..8bedd9b4376 100755 --- a/dbms/tests/queries/0_stateless/00095_union_race_conditions_6.sh +++ b/dbms/tests/queries/0_stateless/00095_union_race_conditions_6.sh @@ -1,3 +1,6 @@ -#!/usr/bin/env bash -e +#!/usr/bin/env bash + +set -o errexit +set -o pipefail for i in {1..10}; do sleep 0.0$RANDOM; seq 1 100 | sed 's/.*/SELECT 1 % (number - 10000000) FROM system.numbers_mt;/' | clickhouse-client -n --receive_timeout=1 --max_block_size=10 >/dev/null 2>&1 && echo 'Fail!' && break; echo -n '.'; done; echo diff --git a/dbms/tests/queries/0_stateless/00115_in_incomplete_result.sh b/dbms/tests/queries/0_stateless/00115_in_incomplete_result.sh index 08f71d6aae8..95adbf69557 100755 --- a/dbms/tests/queries/0_stateless/00115_in_incomplete_result.sh +++ b/dbms/tests/queries/0_stateless/00115_in_incomplete_result.sh @@ -1,4 +1,7 @@ -#!/usr/bin/env bash -e +#!/usr/bin/env bash + +set -o errexit +set -o pipefail clickhouse-client -n --query=" DROP TABLE IF EXISTS test.users;