thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 02:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better usability of "expect" tests: less trouble with running directly

Browse Source
This commit is contained in:
Alexey Milovidov 2024-03-23 17:52:26 +01:00
parent 5e51880750
commit da8da3cbe9
36 changed files with 238 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/queries/0_stateless/01176_mysql_client_interactive.expect
View File

@ -4,7 +4,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/01179_insert_values_semicolon.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/01180_client_syntax_errors.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
set history_file $env(CLICKHOUSE_TMP)/$basename.history if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

10
tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
View File

@ -2,8 +2,14 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
set history_file $env(CLICKHOUSE_TMP)/$basename.history if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/01520_client_print_query_id.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/01565_query_loop_after_client_error.expect
View File

@ -5,8 +5,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

7
tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
View File

@ -2,7 +2,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/01933_client_replxx_convert_history.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/01945_show_debug_warning.expect
View File

@ -5,8 +5,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/02047_client_exception.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

7
tests/queries/0_stateless/02049_clickhouse_local_merge_tree.expect
View File

@ -2,7 +2,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/02105_backslash_letter_commands.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

12
tests/queries/0_stateless/02112_delayed_clickhouse_client_with_queries_file.expect
View File

@ -2,7 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 20 set timeout 20
@ -15,8 +21,8 @@ expect_after {
-i $any_spawn_id timeout { exit 1 } -i $any_spawn_id timeout { exit 1 }
} }
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" system "echo \"drop table if exists t; create table t(i String) engine=Memory; insert into t select 'test string'\" > $CLICKHOUSE_TMP/file_02112"
spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT --disable_suggestion --interactive --queries-file $env(CLICKHOUSE_TMP)/file_02112" spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT --disable_suggestion --interactive --queries-file $CLICKHOUSE_TMP/file_02112"
expect ":) " expect ":) "
send -- "select i from t format TSV\r" send -- "select i from t format TSV\r"

7
tests/queries/0_stateless/02112_delayed_clickhouse_local.expect
View File

@ -2,7 +2,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 20 set timeout 20

11
tests/queries/0_stateless/02112_delayed_clickhouse_local_with_queries_file.expect
View File

@ -2,7 +2,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 20 set timeout 20
@ -15,8 +20,8 @@ expect_after {
-i $any_spawn_id timeout { exit 1 } -i $any_spawn_id timeout { exit 1 }
} }
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" system "echo \"drop table if exists t; create table t(i String) engine=Memory; insert into t select 'test string'\" > $CLICKHOUSE_TMP/file_02112"
spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_LOCAL --disable_suggestion --interactive --queries-file $env(CLICKHOUSE_TMP)/file_02112" spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_LOCAL --disable_suggestion --interactive --queries-file $CLICKHOUSE_TMP/file_02112"
expect ":) " expect ":) "
send -- "select \* from t format TSV\r" send -- "select \* from t format TSV\r"

9
tests/queries/0_stateless/02116_interactive_hello.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/02132_client_history_navigation.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/02160_client_autocomplete_parse_query.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

7
tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.expect
View File

@ -2,7 +2,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 20 set timeout 20

7
tests/queries/0_stateless/02310_clickhouse_client_INSERT_progress_profile_events.expect
View File

@ -8,7 +8,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 60 set timeout 60

7
tests/queries/0_stateless/02310_clickhouse_local_INSERT_progress_profile_events.expect
View File

@ -8,7 +8,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 60 set timeout 60

7
tests/queries/0_stateless/02352_interactive_queries_from_file.expect
View File

@ -3,7 +3,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 20 set timeout 20

9
tests/queries/0_stateless/02417_repeat_input_commands.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

7
tests/queries/0_stateless/02456_progress_tty.expect
View File

@ -2,7 +2,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 60 set timeout 60

7
tests/queries/0_stateless/02480_client_option_print_num_processed_rows.expect
View File

@ -2,7 +2,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 60 set timeout 60

7
tests/queries/0_stateless/02493_inconsistent_hex_and_binary_number.expect
View File

@ -2,7 +2,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 60 set timeout 60

7
tests/queries/0_stateless/02775_show_columns_called_from_mysql.expect
View File

@ -11,7 +11,12 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
log_user 0 log_user 0
set timeout 60 set timeout 60
match_max 100000 match_max 100000

9
tests/queries/0_stateless/02793_implicit_pretty_format_settings.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/02907_suggestions_readonly_user.expect
View File

@ -3,8 +3,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/02931_client_fuzzy_search_crash.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

9
tests/queries/0_stateless/03014_invalid_utf8_client.expect
View File

@ -2,8 +2,13 @@
set basedir [file dirname $argv0] set basedir [file dirname $argv0]
set basename [file tail $argv0] set basename [file tail $argv0]
exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0 if {[info exists env(CLICKHOUSE_TMP)]} {
set history_file $env(CLICKHOUSE_TMP)/$basename.history set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
} else {
set CLICKHOUSE_TMP "."
}
exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
set history_file $CLICKHOUSE_TMP/$basename.history
log_user 0 log_user 0
set timeout 60 set timeout 60

2
utils/check-style/check-style
View File

@ -342,7 +342,7 @@ done
expect_tests=( $(find $ROOT_PATH/tests/queries -name '*.expect') ) expect_tests=( $(find $ROOT_PATH/tests/queries -name '*.expect') )
for test_case in "${expect_tests[@]}"; do for test_case in "${expect_tests[@]}"; do
pattern="^exp_internal -f \$env(CLICKHOUSE_TMP)/\$basename.debuglog 0$" pattern="^exp_internal -f \$CLICKHOUSE_TMP/\$basename.debuglog 0$"
grep -q "$pattern" "$test_case" || echo "Missing '$pattern' in '$test_case'" grep -q "$pattern" "$test_case" || echo "Missing '$pattern' in '$test_case'"
if grep -q "^spawn.*CLICKHOUSE_CLIENT_BINARY$" "$test_case"; then if grep -q "^spawn.*CLICKHOUSE_CLIENT_BINARY$" "$test_case"; then