Merge pull request #75 from percona/master-slave-module-test-bugs

some error messages changed so changed tests
also tweaked progress test timing for pt-table-checksum

Author: frank-cizmich

t/lib/MasterSlave.t

@@ -719,7 +719,7 @@ eval {
 };
 like(
    $EVAL_ERROR,
-   qr/Invalid recursion method: stuff/,
+   qr/Only hosts and processlist may be combined/,
    "--recursion-method processlist,stuff causes error",
 );
 
@@ -728,7 +728,7 @@ eval {
 };
 like(
    $EVAL_ERROR,
-   qr/none cannot be combined with other methods/,
+   qr/Only hosts and processlist may be combined/,
    "--recursion-method none,hosts"
 );
 
@@ -737,7 +737,7 @@ eval {
 };
 like(
    $EVAL_ERROR,
-   qr/none cannot be combined with other methods/,
+   qr/Only hosts and processlist may be combined/,
    "--recursion-method cluster,none"
 );
 
@@ -746,7 +746,7 @@ eval {
 };
 like(
    $EVAL_ERROR,
-   qr/Invalid combination of recursion methods: none, none/,
+   qr/Only hosts and processlist may be combined/,
    "--recursion-method none,none"
 );
 

t/pt-table-checksum/progress.t

@@ -69,10 +69,11 @@ $sb->wait_for_slaves();
 # TEST_WISHLIST PLUGIN_WISHLIST: do this with a plugin to the tool itself,
 # not in this unreliable fashion.
 
-# Frank: this command makes my head hurt. :-)  
-# notice there are 3 *different* wait type commands involved
-# notice final number in the line is the run-time allowed for the "outermost" wait (wait-to-exec). If it is absent it defaults to 1, which may not be enough for sakila.city chunk to appear (at least on my system and for MySQL 5.7
-system("$trunk/util/wait-to-exec '$scripts/wait-for-chunk.sh 12345 sakila city 1' '$scripts/exec-wait-exec.sh 12347 \"stop slave sql_thread\" 6 \"start slave sql_thread\"' 8 >/dev/null &");
+# Notice there are 3 *different* wait type commands involved
+# Final integer in the line is the run-time allowed for the "outermost" wait (wait-to-exec). If it is absent it defaults to 1, which may not be enough for sakila.city# chunk to appear (at least on slow systems)
+
+my $wait_time = $ENV{PERCONA_SLOW_BOX} ? 8 : 4;
+system("$trunk/util/wait-to-exec '$scripts/wait-for-chunk.sh 12345 sakila city 1' '$scripts/exec-wait-exec.sh 12347 \"stop slave sql_thread\" $wait_time \"start slave sql_thread\"' $wait_time >/dev/null &");
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-d sakila)); },