diff options
| author | Monty <monty@mariadb.org> | 2022-12-20 13:38:29 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2022-12-20 23:11:30 +0200 |
| commit | 61e807291c520f78d1e635ba22441cd980a8dd89 (patch) | |
| tree | 2be6952ccce2f22ef24f44d2741d02694afefd93 | |
| parent | 178db5833507a56f78ec40286b76ab59c58d3117 (diff) | |
| download | mariadb-git-61e807291c520f78d1e635ba22441cd980a8dd89.tar.gz | |
Updated some tests for --valgrind
- Increased timeout for binlog_mysqlbinlog_raw_flush.test.
The old timeout was not enough when running with --valgrind
- Disabled ssl_timeout for --valgrind as it times out
- Disabled binlog_truncate_multi_engine for --valgrind as it does restarts
| -rw-r--r-- | mysql-test/main/ssl_timeout.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_mysqlbinlog_raw_flush.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/main/ssl_timeout.test b/mysql-test/main/ssl_timeout.test index f5965f874ff..60b45178d81 100644 --- a/mysql-test/main/ssl_timeout.test +++ b/mysql-test/main/ssl_timeout.test @@ -1,4 +1,6 @@ --source include/have_ssl_communication.inc +# Do not run this test with valgrind as may timeout +--source include/not_valgrind.inc # Save the initial number of concurrent sessions --source include/count_sessions.inc diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_raw_flush.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_raw_flush.test index f95fc0137a2..8ec3856dcb5 100644 --- a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_raw_flush.test +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_raw_flush.test @@ -26,7 +26,7 @@ FLUSH LOGS; INSERT INTO t1 VALUES (1); # Read binlog data from master to intermediary result file ---let TIMEOUT=1 +--let TIMEOUT=5 --echo # timeout TIMEOUT MYSQL_BINLOG --raw --read-from-remote-server --user=root --host=127.0.0.1 --port=MASTER_MYPORT --stop-never --result-file=MYSQLTEST_VARDIR/tmp/ master-bin.000001 --error 124 # Error 124 means timeout was reached --exec timeout $TIMEOUT $MYSQL_BINLOG --raw --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --stop-never --result-file=$MYSQLTEST_VARDIR/tmp/ master-bin.000001 diff --git a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test index 12b0a743916..61d097a8af7 100644 --- a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test +++ b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test @@ -12,6 +12,7 @@ --source include/have_debug.inc --source include/have_debug_sync.inc --source include/have_binlog_format_row.inc +--source include/not_valgrind.inc --let $old_max_binlog_size= `select @@global.max_binlog_size` call mtr.add_suppression("Can.t init tc log"); |