misc test and sandbox fixes

This commit is contained in:
frank-cizmich
2015-07-09 09:52:10 -03:00
parent f033330b33
commit b408fcfd01
24 changed files with 648 additions and 724 deletions

View File

@@ -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.

View File

@@ -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;