percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-18 09:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed pt-upgrade tests for 5.7 compatibility

Browse Source
This commit is contained in:
frank-cizmich
2016-01-16 19:50:18 -03:00
parent 223ad43ecd
commit 66470938d7
4 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/pt-upgrade/compare_hosts.t
View File

@@ -56,6 +56,16 @@ sub load_sample_sql_files {
} }
} }
# default 5.7 mode "STRICT_TRANS_TABLES" converts truncation warnings to errors
# as this is simply a change in category of difference, we disable it for
# test to work.
use SqlModes;
my $modes_host1 = new SqlModes($dbh1, global=>1);
my $modes_host2 = new SqlModes($dbh2, global=>1);
$modes_host1->del('STRICT_TRANS_TABLES');
$modes_host2->del('STRICT_TRANS_TABLES');
while ( my $sampleno = readdir $dh ) { while ( my $sampleno = readdir $dh ) {
next unless $sampleno =~ m/^\d+$/; next unless $sampleno =~ m/^\d+$/;
@@ -103,6 +113,9 @@ while ( my $sampleno = readdir $dh ) {
close $dh; close $dh;
$modes_host1->restore_original_modes();
$modes_host2->restore_original_modes();
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################

13
t/pt-upgrade/compare_results.t
View File

@@ -59,6 +59,16 @@ sub load_sample_sql_files {
} }
} }
# default 5.7 mode "STRICT_TRANS_TABLES" converts truncation warnings to errors
# as this is simply a change in category of difference, we disable it for
# test to work.
use SqlModes;
my $modes_host1 = new SqlModes($dbh1, global=>1);
my $modes_host2 = new SqlModes($dbh2, global=>1);
$modes_host1->del('STRICT_TRANS_TABLES');
$modes_host2->del('STRICT_TRANS_TABLES');
while ( my $sampleno = readdir $dh ) { while ( my $sampleno = readdir $dh ) {
next unless $sampleno =~ m/^\d+$/; next unless $sampleno =~ m/^\d+$/;
@@ -123,6 +133,9 @@ while ( my $sampleno = readdir $dh ) {
close $dh; close $dh;
$modes_host1->restore_original_modes();
$modes_host2->restore_original_modes();
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################

16
t/pt-upgrade/diff_warnings.t
View File

@@ -36,13 +36,26 @@ sub clear_warnings {
$dbh2->do("SELECT /* clear warnings */ 1 FROM mysql.user"); $dbh2->do("SELECT /* clear warnings */ 1 FROM mysql.user");
} }
# default 5.7 mode "STRICT_TRANS_TABLES" converts truncation warnings to errors
# as this is simply a change in category of difference, we disable it for
# test to work.
use SqlModes;
my $modes_host1 = new SqlModes($dbh1, global=>1);
my $modes_host2 = new SqlModes($dbh2, global=>1);
$modes_host1->del('STRICT_TRANS_TABLES');
$modes_host2->del('STRICT_TRANS_TABLES');
$dbh1->do("INSERT INTO test.t VALUES (2, '', 123456789)"); $dbh1->do("INSERT INTO test.t VALUES (2, '', 123456789)");
$dbh2->do("INSERT INTO test.t VALUES (3, '', 123456789)"); $dbh2->do("INSERT INTO test.t VALUES (3, '', 123456789)");
my $event_exec = EventExecutor->new(); my $event_exec = EventExecutor->new();
my $w1 = $event_exec->get_warnings(dbh => $dbh1); my $w1 = $event_exec->get_warnings(dbh => $dbh1);
my $w2 = $event_exec->get_warnings(dbh => $dbh2); my $w2 = $event_exec->get_warnings(dbh => $dbh2);
my $error_1264 = { my $error_1264 = {
code => '1264', code => '1264',
level => 'Warning', level => 'Warning',
@@ -111,6 +124,9 @@ is_deeply(
'Ignore a warning' 'Ignore a warning'
) or diag(Dumper($diffs)); ) or diag(Dumper($diffs));
$modes_host1->restore_original_modes();
$modes_host2->restore_original_modes();
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################

2
t/pt-upgrade/run_time.t
View File

@@ -59,7 +59,7 @@ $output = output(
my $t = time - $t0; my $t = time - $t0;
ok( ok(
$t >= 3 && $t <= 6, $t >= 3 && $t <= ($ENV{PERCONA_SLOW_BOX} ? 8 : 6),
"Exec queries: ran for roughly --run-time seconds" "Exec queries: ran for roughly --run-time seconds"
) or diag($output, 'Actual run time:', $t); ) or diag($output, 'Actual run time:', $t);