From 8cc463f549d29e5c11ea8664e5c17eb05ab50033 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 25 Oct 2020 05:31:58 +0300
Subject: [PATCH] Better test

---
 .../queries/0_stateless/01526_client_start_and_exit.expect | 4 ++--
 .../0_stateless/01526_client_start_and_exit.reference      | 2 +-
 tests/queries/0_stateless/01526_client_start_and_exit.sh   | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/queries/0_stateless/01526_client_start_and_exit.expect b/tests/queries/0_stateless/01526_client_start_and_exit.expect
index 4ad0eea5d97..003439ffa54 100755
--- a/tests/queries/0_stateless/01526_client_start_and_exit.expect
+++ b/tests/queries/0_stateless/01526_client_start_and_exit.expect
@@ -1,12 +1,12 @@
 #!/usr/bin/expect -f
 
-log_user 0
+log_user 1
 set timeout 5
 match_max 100000
 
 if ![info exists env(CLICKHOUSE_PORT_TCP)] {set env(CLICKHOUSE_PORT_TCP) 9000}
 
-spawn clickhouse-client --port "$env(CLICKHOUSE_PORT_TCP)"
+spawn bash -c "clickhouse-client --port $env(CLICKHOUSE_PORT_TCP) && echo $?"
 expect ":) "
 send -- "\4"
 expect eof
diff --git a/tests/queries/0_stateless/01526_client_start_and_exit.reference b/tests/queries/0_stateless/01526_client_start_and_exit.reference
index 7326d960397..e3e2e7b22af 100644
--- a/tests/queries/0_stateless/01526_client_start_and_exit.reference
+++ b/tests/queries/0_stateless/01526_client_start_and_exit.reference
@@ -1 +1 @@
-Ok
+Loaded 10000 queries.
diff --git a/tests/queries/0_stateless/01526_client_start_and_exit.sh b/tests/queries/0_stateless/01526_client_start_and_exit.sh
index d3fd2cb73b2..abcf51d8c50 100755
--- a/tests/queries/0_stateless/01526_client_start_and_exit.sh
+++ b/tests/queries/0_stateless/01526_client_start_and_exit.sh
@@ -4,12 +4,12 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 # Create a huge amount of tables, so Suggest will take a time to load
-seq 1 1000 | sed -r -e 's/(.+)/CREATE TABLE IF NOT EXISTS test\1 (x UInt8) ENGINE = Memory;/' | ${CLICKHOUSE_CLIENT} -n
+${CLICKHOUSE_CLIENT} -q "SELECT 'CREATE TABLE test_' || hex(randomPrintableASCII(40)) || '(x UInt8) Engine=Memory;' FROM numbers(10000)" --format=TSVRaw | ${CLICKHOUSE_BENCHMARK} -c32 -i 10000 -d 0 2>&1 | grep -F 'Loaded 10000 queries'
 
 function stress()
 {
     while true; do
-        ./"$CURDIR"/01526_client_start_and_exit.expect
+        ./"$CURDIR"/01526_client_start_and_exit.expect | grep -v -P 'ClickHouse client|Connecting|Connected|:\) Bye\.|^\s*$|spawn bash|^0\s*$'
     done
 }
 
@@ -20,6 +20,3 @@ for _ in {1..10}; do
 done
 
 wait
-echo 'Ok'
-
-seq 1 1000 | sed -r -e 's/(.+)/DROP TABLE test\1;/' | ${CLICKHOUSE_CLIENT} -n