mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-26 05:58:16 +00:00
misc test and sandbox fixes
This commit is contained in:
@@ -2123,6 +2123,10 @@ is(
|
||||
# direct STDOUT to a file and still see the prompt
|
||||
# #############################################################################
|
||||
|
||||
SKIP: {
|
||||
eval {require Term::ReadKey};
|
||||
skip ('\'prompt_no_echo outputs to STDERR\' because Term::ReadKey not available', 1) if $EVAL_ERROR;
|
||||
|
||||
$o = new OptionParser();
|
||||
|
||||
$output = output(
|
||||
@@ -2141,6 +2145,8 @@ is (
|
||||
'prompt_no_echo outputs prompt to STDERR'
|
||||
);
|
||||
|
||||
} # end skip
|
||||
|
||||
# #############################################################################
|
||||
# Issue 1361293: Global config file with no-version-check option makes tools
|
||||
# that don't recognize the option fail.
|
||||
|
@@ -634,8 +634,8 @@ SKIP: {
|
||||
my $root_dbh = DBI->connect(
|
||||
"DBI:mysql:host=127.0.0.1;port=12345", 'root', 'msandbox',
|
||||
{ PrintError => 0, RaiseError => 1 });
|
||||
$root_dbh->do("GRANT SELECT ON test.* TO 'user'\@'\%'");
|
||||
$root_dbh->do('FLUSH PRIVILEGES');
|
||||
|
||||
$root_dbh->do(q[GRANT SELECT ON test.* TO 'user'@'%'] ) || die($root_dbh->errstr);
|
||||
|
||||
my $user_dbh = DBI->connect(
|
||||
"DBI:mysql:host=127.0.0.1;port=12345", 'user', undef,
|
||||
@@ -970,4 +970,4 @@ diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`);
|
||||
$sb->wipe_clean($dbh) if $dbh;
|
||||
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
|
||||
done_testing;
|
||||
exit;
|
||||
exit;
|
||||
|
Reference in New Issue
Block a user