From 61dbfb3a016fa07ea1d0eece86b7af9414a79c9c Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Wed, 29 Aug 2007 19:02:33 +0200 Subject: [PATCH] Move instance manager tests to it's own suite --- .../{ => suite/im}/r/im_cmd_line.result | 0 .../im}/r/im_daemon_life_cycle.result | 0 .../{ => suite/im}/r/im_instance_conf.result | 0 .../{ => suite/im}/r/im_life_cycle.result | 0 mysql-test/{ => suite/im}/r/im_options.result | 0 mysql-test/{ => suite/im}/r/im_utils.result | 0 mysql-test/suite/im/t/disabled.def | 20 ++++++++ .../{include => suite/im/t}/im_check_env.inc | 0 .../{ => suite/im}/t/im_cmd_line.imtest | 2 +- .../im}/t/im_daemon_life_cycle-im.opt | 0 .../im}/t/im_daemon_life_cycle.imtest | 48 ++++++++++--------- .../{ => suite/im}/t/im_instance_conf-im.opt | 0 .../{ => suite/im}/t/im_instance_conf.imtest | 2 +- .../{ => suite/im}/t/im_life_cycle-im.opt | 0 .../{ => suite/im}/t/im_life_cycle.imtest | 14 +++--- mysql-test/{ => suite/im}/t/im_options-im.opt | 0 mysql-test/{ => suite/im}/t/im_options.imtest | 2 +- mysql-test/{ => suite/im}/t/im_utils-im.opt | 0 mysql-test/{ => suite/im}/t/im_utils.imtest | 8 ++-- mysql-test/{ => suite/im}/t/kill_n_check.sh | 0 mysql-test/{ => suite/im}/t/log.sh | 0 mysql-test/{ => suite/im}/t/utils.sh | 0 .../{ => suite/im}/t/wait_for_process.sh | 0 .../{ => suite/im}/t/wait_for_socket.sh | 0 mysql-test/t/disabled.def | 9 ---- 25 files changed, 61 insertions(+), 44 deletions(-) rename mysql-test/{ => suite/im}/r/im_cmd_line.result (100%) rename mysql-test/{ => suite/im}/r/im_daemon_life_cycle.result (100%) rename mysql-test/{ => suite/im}/r/im_instance_conf.result (100%) rename mysql-test/{ => suite/im}/r/im_life_cycle.result (100%) rename mysql-test/{ => suite/im}/r/im_options.result (100%) rename mysql-test/{ => suite/im}/r/im_utils.result (100%) create mode 100644 mysql-test/suite/im/t/disabled.def rename mysql-test/{include => suite/im/t}/im_check_env.inc (100%) rename mysql-test/{ => suite/im}/t/im_cmd_line.imtest (98%) rename mysql-test/{ => suite/im}/t/im_daemon_life_cycle-im.opt (100%) rename mysql-test/{ => suite/im}/t/im_daemon_life_cycle.imtest (52%) rename mysql-test/{ => suite/im}/t/im_instance_conf-im.opt (100%) rename mysql-test/{ => suite/im}/t/im_instance_conf.imtest (99%) rename mysql-test/{ => suite/im}/t/im_life_cycle-im.opt (100%) rename mysql-test/{ => suite/im}/t/im_life_cycle.imtest (92%) rename mysql-test/{ => suite/im}/t/im_options-im.opt (100%) rename mysql-test/{ => suite/im}/t/im_options.imtest (99%) rename mysql-test/{ => suite/im}/t/im_utils-im.opt (100%) rename mysql-test/{ => suite/im}/t/im_utils.imtest (91%) rename mysql-test/{ => suite/im}/t/kill_n_check.sh (100%) rename mysql-test/{ => suite/im}/t/log.sh (100%) rename mysql-test/{ => suite/im}/t/utils.sh (100%) rename mysql-test/{ => suite/im}/t/wait_for_process.sh (100%) rename mysql-test/{ => suite/im}/t/wait_for_socket.sh (100%) diff --git a/mysql-test/r/im_cmd_line.result b/mysql-test/suite/im/r/im_cmd_line.result similarity index 100% rename from mysql-test/r/im_cmd_line.result rename to mysql-test/suite/im/r/im_cmd_line.result diff --git a/mysql-test/r/im_daemon_life_cycle.result b/mysql-test/suite/im/r/im_daemon_life_cycle.result similarity index 100% rename from mysql-test/r/im_daemon_life_cycle.result rename to mysql-test/suite/im/r/im_daemon_life_cycle.result diff --git a/mysql-test/r/im_instance_conf.result b/mysql-test/suite/im/r/im_instance_conf.result similarity index 100% rename from mysql-test/r/im_instance_conf.result rename to mysql-test/suite/im/r/im_instance_conf.result diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/suite/im/r/im_life_cycle.result similarity index 100% rename from mysql-test/r/im_life_cycle.result rename to mysql-test/suite/im/r/im_life_cycle.result diff --git a/mysql-test/r/im_options.result b/mysql-test/suite/im/r/im_options.result similarity index 100% rename from mysql-test/r/im_options.result rename to mysql-test/suite/im/r/im_options.result diff --git a/mysql-test/r/im_utils.result b/mysql-test/suite/im/r/im_utils.result similarity index 100% rename from mysql-test/r/im_utils.result rename to mysql-test/suite/im/r/im_utils.result diff --git a/mysql-test/suite/im/t/disabled.def b/mysql-test/suite/im/t/disabled.def new file mode 100644 index 00000000000..56828810bf1 --- /dev/null +++ b/mysql-test/suite/im/t/disabled.def @@ -0,0 +1,20 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# : BUG# +# +# Do not use any TAB characters for whitespace. +# +############################################################################## +im_options : Bug#20294 2006-07-24 stewart Instance manager test im_options fails randomly +im_daemon_life_cycle : Bug#20294 2007-05-14 alik Instance manager tests fail randomly +im_cmd_line : Bug#20294 2007-05-14 alik Instance manager tests fail randomly +im_utils : Bug#20294 2007-05-30 alik Instance manager tests fail randomly +im_instance_conf : Bug#20294 2007-05-30 alik Instance manager tests fail randomly +im_life_cycle : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance. +im_instance_conf : BUG#28743 Instance manager generates warnings in test suite +im_utils : BUG#28743 Instance manager generates warnings in test suite + diff --git a/mysql-test/include/im_check_env.inc b/mysql-test/suite/im/t/im_check_env.inc similarity index 100% rename from mysql-test/include/im_check_env.inc rename to mysql-test/suite/im/t/im_check_env.inc diff --git a/mysql-test/t/im_cmd_line.imtest b/mysql-test/suite/im/t/im_cmd_line.imtest similarity index 98% rename from mysql-test/t/im_cmd_line.imtest rename to mysql-test/suite/im/t/im_cmd_line.imtest index 1de43efe92b..e8264b5bb8a 100644 --- a/mysql-test/t/im_cmd_line.imtest +++ b/mysql-test/suite/im/t/im_cmd_line.imtest @@ -4,7 +4,7 @@ # ########################################################################### ---source include/im_check_env.inc +--source suite/im/t/im_check_env.inc ########################################################################### diff --git a/mysql-test/t/im_daemon_life_cycle-im.opt b/mysql-test/suite/im/t/im_daemon_life_cycle-im.opt similarity index 100% rename from mysql-test/t/im_daemon_life_cycle-im.opt rename to mysql-test/suite/im/t/im_daemon_life_cycle-im.opt diff --git a/mysql-test/t/im_daemon_life_cycle.imtest b/mysql-test/suite/im/t/im_daemon_life_cycle.imtest similarity index 52% rename from mysql-test/t/im_daemon_life_cycle.imtest rename to mysql-test/suite/im/t/im_daemon_life_cycle.imtest index c2eac46c1e4..c42ab89cc49 100644 --- a/mysql-test/t/im_daemon_life_cycle.imtest +++ b/mysql-test/suite/im/t/im_daemon_life_cycle.imtest @@ -1,3 +1,5 @@ +let $UTIL=$MYSQL_TEST_DIR/suite/im/t; + ########################################################################### # # This file contains test for (1.2) test suite. @@ -6,11 +8,11 @@ # ########################################################################### ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle im_daemon_life_cycle.imtest started. +--exec $UTIL/log.sh im_daemon_life_cycle im_daemon_life_cycle.imtest started. ########################################################################### ---source include/im_check_env.inc +--source suite/im/t/im_check_env.inc # Turn on reconnect, not on by default anymore. --enable_reconnect @@ -30,15 +32,15 @@ # ########################################################################### ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Main-test: starting... +--exec $UTIL/log.sh im_daemon_life_cycle Main-test: starting... ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Killing IM-main... ---exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_PATH_PID restarted 55 im_daemon_life_cycle +--exec $UTIL/log.sh im_daemon_life_cycle Killing IM-main... +--exec $UTIL/kill_n_check.sh $IM_PATH_PID restarted 55 im_daemon_life_cycle ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Waiting for IM-main to start accepting connections... ---exec $MYSQL_TEST_DIR/t/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 55 im_daemon_life_cycle +--exec $UTIL/log.sh im_daemon_life_cycle Waiting for IM-main to start accepting connections... +--exec $UTIL/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 55 im_daemon_life_cycle ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Main-test: done. +--exec $UTIL/log.sh im_daemon_life_cycle Main-test: done. ########################################################################### # @@ -55,29 +57,29 @@ --echo -- Test for BUG#12751 --echo -------------------------------------------------------------------- ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle BUG12751: starting... +--exec $UTIL/log.sh im_daemon_life_cycle BUG12751: starting... # 1. Start mysqld; ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: starting... +--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: starting... START INSTANCE mysqld2; ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: waiting to start... ---exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 55 started im_daemon_life_cycle +--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: waiting to start... +--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 55 started im_daemon_life_cycle ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: started. +--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: started. # 2. Restart IM-main; ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Killing IM-main... ---exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_PATH_PID restarted 55 im_daemon_life_cycle +--exec $UTIL/log.sh im_daemon_life_cycle Killing IM-main... +--exec $UTIL/kill_n_check.sh $IM_PATH_PID restarted 55 im_daemon_life_cycle ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Waiting for IM-main to start accepting connections... ---exec $MYSQL_TEST_DIR/t/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 55 im_daemon_life_cycle +--exec $UTIL/log.sh im_daemon_life_cycle Waiting for IM-main to start accepting connections... +--exec $UTIL/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 55 im_daemon_life_cycle # 3. Issue some statement -- connection should be re-established. ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Checking that IM-main processing commands... +--exec $UTIL/log.sh im_daemon_life_cycle Checking that IM-main processing commands... --replace_column 2 STATE 3 VERSION_NUMBER 4 VERSION SHOW INSTANCE STATUS mysqld1; @@ -86,13 +88,13 @@ SHOW INSTANCE STATUS mysqld1; # So, if it we do not stop it, it will be stopped by mysql-test-run.pl with # warning. ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: stopping... +--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: stopping... STOP INSTANCE mysqld2; ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: waiting to stop... ---exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 55 stopped im_daemon_life_cycle ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: stopped. +--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: waiting to stop... +--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 55 stopped im_daemon_life_cycle +--exec $UTIL/log.sh im_daemon_life_cycle mysqld2: stopped. ########################################################################### ---exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle BUG12751: done. +--exec $UTIL/log.sh im_daemon_life_cycle BUG12751: done. diff --git a/mysql-test/t/im_instance_conf-im.opt b/mysql-test/suite/im/t/im_instance_conf-im.opt similarity index 100% rename from mysql-test/t/im_instance_conf-im.opt rename to mysql-test/suite/im/t/im_instance_conf-im.opt diff --git a/mysql-test/t/im_instance_conf.imtest b/mysql-test/suite/im/t/im_instance_conf.imtest similarity index 99% rename from mysql-test/t/im_instance_conf.imtest rename to mysql-test/suite/im/t/im_instance_conf.imtest index e7f1e511113..b667df41f98 100644 --- a/mysql-test/t/im_instance_conf.imtest +++ b/mysql-test/suite/im/t/im_instance_conf.imtest @@ -26,7 +26,7 @@ # ########################################################################### ---source include/im_check_env.inc +--source suite/im/t/im_check_env.inc ########################################################################### # diff --git a/mysql-test/t/im_life_cycle-im.opt b/mysql-test/suite/im/t/im_life_cycle-im.opt similarity index 100% rename from mysql-test/t/im_life_cycle-im.opt rename to mysql-test/suite/im/t/im_life_cycle-im.opt diff --git a/mysql-test/t/im_life_cycle.imtest b/mysql-test/suite/im/t/im_life_cycle.imtest similarity index 92% rename from mysql-test/t/im_life_cycle.imtest rename to mysql-test/suite/im/t/im_life_cycle.imtest index 3721b92e2b7..31f63d82505 100644 --- a/mysql-test/t/im_life_cycle.imtest +++ b/mysql-test/suite/im/t/im_life_cycle.imtest @@ -1,3 +1,5 @@ +let $UTIL=$MYSQL_TEST_DIR/suite/im/t; + ########################################################################### # # This file contains test for (1.1) test suite. @@ -6,7 +8,7 @@ # ########################################################################### ---source include/im_check_env.inc +--source suite/im/t/im_check_env.inc ########################################################################### # @@ -25,7 +27,7 @@ START INSTANCE mysqld2; # FIXME: START INSTANCE should be synchronous. ---exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_life_cycle +--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_life_cycle # FIXME: Result of SHOW INSTANCES here is not deterministic unless START # INSTANCE is synchronous. Even waiting for mysqld to start by looking at @@ -58,7 +60,7 @@ SHOW VARIABLES LIKE 'port'; STOP INSTANCE mysqld2; # FIXME: STOP INSTANCE should be synchronous. ---exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped im_life_cycle +--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped im_life_cycle # FIXME: Result of SHOW INSTANCES here is not deterministic unless START # INSTANCE is synchronous. Even waiting for mysqld to start by looking at @@ -121,7 +123,7 @@ STOP INSTANCE mysqld3; --echo -- 1.1.6. --echo -------------------------------------------------------------------- ---exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_MYSQLD1_PATH_PID restarted 30 im_life_cycle +--exec $UTIL/kill_n_check.sh $IM_MYSQLD1_PATH_PID restarted 30 im_life_cycle # Give some time to IM to detect that mysqld was restarted. It should be # longer than monitoring interval. @@ -143,7 +145,7 @@ SHOW INSTANCES; START INSTANCE mysqld2; # FIXME: START INSTANCE should be synchronous. ---exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_life_cycle +--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_life_cycle # FIXME: Result of SHOW INSTANCES here is not deterministic unless START # INSTANCE is synchronous. Even waiting for mysqld to start by looking at @@ -151,7 +153,7 @@ START INSTANCE mysqld2; # mysqld has started. # SHOW INSTANCES; ---exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_MYSQLD2_PATH_PID killed 10 im_life_cycle +--exec $UTIL/kill_n_check.sh $IM_MYSQLD2_PATH_PID killed 10 im_life_cycle # FIXME: Result of SHOW INSTANCES here is not deterministic unless START # INSTANCE is synchronous. Even waiting for mysqld to start by looking at diff --git a/mysql-test/t/im_options-im.opt b/mysql-test/suite/im/t/im_options-im.opt similarity index 100% rename from mysql-test/t/im_options-im.opt rename to mysql-test/suite/im/t/im_options-im.opt diff --git a/mysql-test/t/im_options.imtest b/mysql-test/suite/im/t/im_options.imtest similarity index 99% rename from mysql-test/t/im_options.imtest rename to mysql-test/suite/im/t/im_options.imtest index 8f9bed16473..d251b97d8e7 100644 --- a/mysql-test/t/im_options.imtest +++ b/mysql-test/suite/im/t/im_options.imtest @@ -32,7 +32,7 @@ # ########################################################################### ---source include/im_check_env.inc +--source suite/im/t/im_check_env.inc ########################################################################### # diff --git a/mysql-test/t/im_utils-im.opt b/mysql-test/suite/im/t/im_utils-im.opt similarity index 100% rename from mysql-test/t/im_utils-im.opt rename to mysql-test/suite/im/t/im_utils-im.opt diff --git a/mysql-test/t/im_utils.imtest b/mysql-test/suite/im/t/im_utils.imtest similarity index 91% rename from mysql-test/t/im_utils.imtest rename to mysql-test/suite/im/t/im_utils.imtest index 0866b87204a..b935634e96c 100644 --- a/mysql-test/t/im_utils.imtest +++ b/mysql-test/suite/im/t/im_utils.imtest @@ -6,7 +6,9 @@ # ########################################################################### ---source include/im_check_env.inc +--source suite/im/t/im_check_env.inc + +let $UTIL=$MYSQL_TEST_DIR/suite/im/t; ########################################################################### @@ -31,10 +33,10 @@ SHOW INSTANCE OPTIONS mysqld2; # START INSTANCE mysqld2; ---exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_utils +--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_utils STOP INSTANCE mysqld2; ---exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped im_utils +--exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped im_utils # # Check 'SHOW LOG FILES' command: diff --git a/mysql-test/t/kill_n_check.sh b/mysql-test/suite/im/t/kill_n_check.sh similarity index 100% rename from mysql-test/t/kill_n_check.sh rename to mysql-test/suite/im/t/kill_n_check.sh diff --git a/mysql-test/t/log.sh b/mysql-test/suite/im/t/log.sh similarity index 100% rename from mysql-test/t/log.sh rename to mysql-test/suite/im/t/log.sh diff --git a/mysql-test/t/utils.sh b/mysql-test/suite/im/t/utils.sh similarity index 100% rename from mysql-test/t/utils.sh rename to mysql-test/suite/im/t/utils.sh diff --git a/mysql-test/t/wait_for_process.sh b/mysql-test/suite/im/t/wait_for_process.sh similarity index 100% rename from mysql-test/t/wait_for_process.sh rename to mysql-test/suite/im/t/wait_for_process.sh diff --git a/mysql-test/t/wait_for_socket.sh b/mysql-test/suite/im/t/wait_for_socket.sh similarity index 100% rename from mysql-test/t/wait_for_socket.sh rename to mysql-test/suite/im/t/wait_for_socket.sh diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 0ba56a74f57..a39de913659 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -11,15 +11,6 @@ ############################################################################## user_limits : Bug#23921 random failure of user_limits.test -im_options : Bug#20294 2006-07-24 stewart Instance manager test im_options fails randomly -im_daemon_life_cycle : Bug#20294 2007-05-14 alik Instance manager tests fail randomly -im_cmd_line : Bug#20294 2007-05-14 alik Instance manager tests fail randomly -im_utils : Bug#20294 2007-05-30 alik Instance manager tests fail randomly -im_instance_conf : Bug#20294 2007-05-30 alik Instance manager tests fail randomly -im_life_cycle : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance. -im_instance_conf : BUG#28743 Instance manager generates warnings in test suite -im_utils : BUG#28743 Instance manager generates warnings in test suite - concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper