Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some expect tests leftovers and enable them in fasttest #46915

Merged
merged 5 commits into from
Feb 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Client/ReplxxLineReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ ReplxxLineReader::ReplxxLineReader(
};

rx.bind_key(Replxx::KEY::control('R'), interactive_history_search);
#endif

/// Rebind regular incremental search to C-T.
///
Expand All @@ -443,7 +444,6 @@ ReplxxLineReader::ReplxxLineReader(
uint32_t reverse_search = Replxx::KEY::control('R');
return rx.invoke(Replxx::ACTION::HISTORY_INCREMENTAL_SEARCH, reverse_search);
});
#endif
}

ReplxxLineReader::~ReplxxLineReader()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/expect -f
# Tags: long

set basedir [file dirname $argv0]
set basename [file tail $argv0]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ expect "Syntax error: failed at position 93 ('UInt64'):*"
send -- "select (1, 2\r"
expect "Syntax error: failed at position 8 ('('):"
expect "Unmatched parentheses: ("
expect ":) "

send -- "\4"
expect eof
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/expect -f
# Tags: long

set basedir [file dirname $argv0]
set basename [file tail $argv0]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/expect -f
# Tags: long

# This is a separate test, because we want to test the interactive mode.
# https://github.com/ClickHouse/ClickHouse/issues/19353
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/expect -f
# Tags: long

set basedir [file dirname $argv0]
set basename [file tail $argv0]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/expect -f
# Tags: no-fasttest

# This is a test for system.warnings. Testing in interactive mode is necessary,
# as we want to see certain warnings from client
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/expect -f
# Tags: no-parallel

set basedir [file dirname $argv0]
set basename [file tail $argv0]
Expand All @@ -16,15 +15,13 @@ expect_after {
-i $any_spawn_id timeout { exit 1 }
}

system "$basedir/helpers/02112_prepare.sh"
spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT --disable_suggestion --interactive --queries-file $basedir/file_02112"
system "echo \"drop table if exists t; create table t(i String) engine=Memory; insert into t select 'test string'\" > $env(CLICKHOUSE_TMP)/file_02112"
spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT --disable_suggestion --interactive --queries-file $env(CLICKHOUSE_TMP)/file_02112"
expect ":) "

send -- "select * from t format TSV\r"
expect "1"
send -- "select i from t format TSV\r"
expect "test string"
expect ":) "

send ""
expect eof

system "$basedir/helpers/02112_clean.sh"
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/expect -f
# Tags: no-parallel

set basedir [file dirname $argv0]
set basename [file tail $argv0]
Expand All @@ -16,15 +15,13 @@ expect_after {
-i $any_spawn_id timeout { exit 1 }
}

system "$basedir/helpers/02112_prepare.sh"
spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_LOCAL --disable_suggestion --interactive --queries-file $basedir/file_02112"
system "echo \"drop table if exists t; create table t(i String) engine=Memory; insert into t select 'test string'\" > $env(CLICKHOUSE_TMP)/file_02112"
spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_LOCAL --disable_suggestion --interactive --queries-file $env(CLICKHOUSE_TMP)/file_02112"
expect ":) "

send -- "select * from t format TSV\r"
expect "1"
send -- "select \* from t format TSV\r"
expect "test string"
expect ":) "

send ""
expect eof

system "$basedir/helpers/02112_clean.sh"
1 change: 0 additions & 1 deletion tests/queries/0_stateless/02116_interactive_hello.expect
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/expect -f
# Tags: long

set basedir [file dirname $argv0]
set basename [file tail $argv0]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ expect ":) "

# Generate UIUD to avoid matching old database/tables/columns from previous test runs.
send -- "select 'begin-' || replace(toString(generateUUIDv4()), '-', '') || '-end' format TSV\r"
expect -re TSV.*TSV.*begin-(.*)-end.*
expect -re "TSV.*TSV.*begin-(.*)-end.*:\\) "
set uuid $expect_out(1,string)
expect ":) "

# CREATE DATABASE
send -- "create database new_${uuid}_database\r"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/expect -f
# Tags: long

# This is the regression for the concurrent access in ProgressIndication,
# so it is important to read enough rows here (10e6).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/expect -f
# Tags: long

# This is the regression for the concurrent access in ProgressIndication,
# so it is important to read enough rows here (10e6).
Expand Down
5 changes: 0 additions & 5 deletions tests/queries/0_stateless/helpers/02112_clean.sh

This file was deleted.

5 changes: 0 additions & 5 deletions tests/queries/0_stateless/helpers/02112_prepare.sh

This file was deleted.