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

PT-2155 - Fix tests for pt-upgrade (#597)

Browse Source 
Version 5.7 introduced default mysql.session and mysql.sys. So I updated results for the diff_rows test.
This commit is contained in:
Sveta Smirnova
2023-02-14 00:58:04 +03:00
committed by GitHub
parent 61a53edc54
commit e9c3d8f6fb
1 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
t/pt-upgrade/diff_rows.t
View File

@@ -76,7 +76,25 @@ my $expect = [
[qw(msandbox)], [qw(msandbox)],
] ]
]; ];
if ($sandbox_version ge '8.0') { if ($sandbox_version ge '5.7' and $sandbox_version lt '8.0') {
$expect =[
[
1,
[ 'msandbox' ],
[ 'root' ]
],
[
2,
[ 'mysql.session' ],
[ 'mysql.sys' ]
],
[
3,
[ 'mysql.sys' ],
[ 'mysql.session' ]
]
];
} elsif ($sandbox_version ge '8.0') {
$expect =[ $expect =[
[ [
1, 1,
@@ -103,9 +121,6 @@ test_diff (
expect => $expect, expect => $expect,
); );
# Test 3
diag(">> 3");
$expect = [ $expect = [
[ [
1, 1,
@@ -116,7 +131,19 @@ $expect = [
], ],
]; ];
if ($sandbox_version ge '8.0') { if ($sandbox_version ge '5.7' and $sandbox_version lt '8.0') {
$expect =[
[
3,
undef,
[
[ 'mysql.session' ],
[ 'mysql.sys' ],
[ 'root' ],
]
]
];
} elsif ($sandbox_version ge '8.0') {
$expect =[ $expect =[
[ [
4, 4,
@@ -131,7 +158,7 @@ if ($sandbox_version ge '8.0') {
} }
test_diff ( test_diff (
name => 'Host1 missing a row', name => 'Host1 missing rows',
query1 => "select user from mysql.user where user='msandbox' order by user", query1 => "select user from mysql.user where user='msandbox' order by user",
query2 => 'select user from mysql.user order by user', query2 => 'select user from mysql.user order by user',
expect => $expect, expect => $expect,
@@ -147,7 +174,19 @@ $expect = [
], ],
]; ];
if ($sandbox_version ge '8.0') { if ($sandbox_version ge '5.7' and $sandbox_version lt '8.0') {
$expect =[
[
3,
[
[ 'mysql.session' ],
[ 'mysql.sys' ],
[ 'root' ],
],
undef,
]
];
} elsif ($sandbox_version ge '8.0') {
$expect =[ $expect =[
[ [
4, 4,