Commit 5f0a4728 authored by Michael Widenius's avatar Michael Widenius

Fixed test failure that ended with "There is no group named 'mysqld.10' that...

Fixed test failure that ended with "There is no group named 'mysqld.10' that can be used to resolve 'port' for test"

mysql-test/lib/My/ConfigFactory.pm:
  Added test name to error output
mysql-test/mysql-test-run.pl:
  Added testname as part of ConfigFactory for better error message
mysql-test/suite/rpl/t/rpl_test_framework.cnf:
  Added space after # to ensure that ConfigFactory treat comments as comments
parent 1b666514
...@@ -358,7 +358,7 @@ sub post_check_client_group { ...@@ -358,7 +358,7 @@ sub post_check_client_group {
if (! defined $option){ if (! defined $option){
#print $config; #print $config;
croak "Could not get value for '$name_from'"; croak "Could not get value for '$name_from' for test $self->{testname}";
} }
$config->insert($client_group_name, $name_to, $option->value()) $config->insert($client_group_name, $name_to, $option->value())
} }
...@@ -446,7 +446,7 @@ sub resolve_at_variable { ...@@ -446,7 +446,7 @@ sub resolve_at_variable {
my $from_group= $config->group($group_name) my $from_group= $config->group($group_name)
or croak "There is no group named '$group_name' that ", or croak "There is no group named '$group_name' that ",
"can be used to resolve '$option_name'"; "can be used to resolve '$option_name' for test '$self->{testname}'";
my $from= $from_group->value($option_name); my $from= $from_group->value($option_name);
$config->insert($group->name(), $option->name(), $from) $config->insert($group->name(), $option->name(), $from)
...@@ -623,6 +623,7 @@ sub new_config { ...@@ -623,6 +623,7 @@ sub new_config {
HOSTS => $hosts, HOSTS => $hosts,
NEXT_HOST => 0, NEXT_HOST => 0,
SERVER_ID => 1, SERVER_ID => 1,
testname => $args->{testname},
}, $class; }, $class;
# add auto-options # add auto-options
......
...@@ -3826,6 +3826,7 @@ sub run_testcase ($$) { ...@@ -3826,6 +3826,7 @@ sub run_testcase ($$) {
# Generate new config file from template # Generate new config file from template
$config= My::ConfigFactory->new_config $config= My::ConfigFactory->new_config
( { ( {
testname => $tinfo->{name},
basedir => $basedir, basedir => $basedir,
testdir => $glob_mysql_test_dir, testdir => $glob_mysql_test_dir,
template_path => $tinfo->{template_path}, template_path => $tinfo->{template_path},
......
...@@ -17,18 +17,18 @@ log-slave-updates ...@@ -17,18 +17,18 @@ log-slave-updates
log-slave-updates log-slave-updates
[mysqld.9] [mysqld.9]
log-slave-updates log-slave-updates
#[mysqld.10] # [mysqld.10]
#log-slave-updates # log-slave-updates
#[mysqld.11] # [mysqld.11]
#log-slave-updates # log-slave-updates
#[mysqld.12] # [mysqld.12]
#log-slave-updates # log-slave-updates
#[mysqld.13] # [mysqld.13]
#log-slave-updates # log-slave-updates
#[mysqld.14] # [mysqld.14]
#log-slave-updates # log-slave-updates
#[mysqld.15] # [mysqld.15]
#log-slave-updates # log-slave-updates
[ENV] [ENV]
SERVER_MYPORT_3= @mysqld.3.port SERVER_MYPORT_3= @mysqld.3.port
...@@ -38,9 +38,9 @@ SERVER_MYPORT_6= @mysqld.6.port ...@@ -38,9 +38,9 @@ SERVER_MYPORT_6= @mysqld.6.port
SERVER_MYPORT_7= @mysqld.7.port SERVER_MYPORT_7= @mysqld.7.port
SERVER_MYPORT_8= @mysqld.8.port SERVER_MYPORT_8= @mysqld.8.port
SERVER_MYPORT_9= @mysqld.9.port SERVER_MYPORT_9= @mysqld.9.port
#SERVER_MYPORT_10= @mysqld.10.port # SERVER_MYPORT_10= @mysqld.10.port
#SERVER_MYPORT_11= @mysqld.11.port # SERVER_MYPORT_11= @mysqld.11.port
#SERVER_MYPORT_12= @mysqld.12.port # SERVER_MYPORT_12= @mysqld.12.port
#SERVER_MYPORT_13= @mysqld.13.port # SERVER_MYPORT_13= @mysqld.13.port
#SERVER_MYPORT_14= @mysqld.14.port # SERVER_MYPORT_14= @mysqld.14.port
#SERVER_MYPORT_15= @mysqld.15.port # SERVER_MYPORT_15= @mysqld.15.port
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment