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

PT-2154 - Fix tests for pt-table-sync

Browse Source 
- Removed junk comment from t/pt-table-sync/pt-2309.t
- Re-enabled t/pt-table-sync/issue_96.t in 8.0+
- Re-enabled tests in t/pt-table-sync/pt-1256.t in 8.0.14+
- Re-enabled t/pt-table-sync/master_master.t in 8.0+
- Re-enabled t/pt-table-sync/lock_and_rename.t in 8.0+
- Re-enabled t/pt-table-sync/issue_965.t
- Added proper disable comments into t/pt-table-sync/issue_920.t and t/pt-table-sync/issue_996.t
This commit is contained in:
Sveta Smirnova
2024-05-14 20:12:25 +03:00
parent 4a63df51e5
commit e2ca142baa
9 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
t/pt-table-sync/pt-1256.t
View File

@@ -19,6 +19,7 @@ use Test::More;
use PerconaTest;
use Sandbox;
require "$trunk/bin/pt-table-sync";
require VersionParser;
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
@@ -49,6 +50,7 @@ $sb->load_file('master', "t/lib/samples/charset.sql");
my $put = encode('UTF-8','абвгд');
my $want = 'абвгд';
my $row;
$master_dbh->do("SET NAMES 'utf8'");
$slave1_dbh->do("SET NAMES 'utf8'");
@@ -72,21 +74,25 @@ like(
"PT-1256 Set the correct charset"
);
# 2
my $row = $slave1_dbh->selectrow_hashref("SELECT f2 FROM test.t1 WHERE id = 1");
is(
$row->{f2},
$want,
"Character set is correct",
) or diag("Want '".($want||"")."', got '".($row->{f2}||"")."'");
SKIP: {
skip "Skipping in MySQL 8.0.4-rc since there is an error in the server itself", 2 if ($sandbox_version ge '8.0');
my $vp = VersionParser->new($master_dbh);
if ($vp->cmp('8.0') > -1 && $vp->cmp('8.0.14') < 0 && $vp->flavor() !~ m/maria/i) {
skip "Skipping in MySQL 8.0.4-rc - 8.0.13 since there is an error in the server itself", 3;
}
# 2
$row = $slave1_dbh->selectrow_hashref("SELECT f2 FROM test.t1 WHERE id = 1");
is(
$row->{f2},
$want,
"Character set is correct",
) or diag("Want '".($want||"")."', got '".($row->{f2}||"")."'");
# 3
$output = `$trunk/bin/pt-table-sync --execute --lock-and-rename h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=t1 t=t2 2>&1`;
$output = `/tmp/12345/use -e 'show create table test.t2'`;
like($output, qr/COMMENT='test1'/, '--lock-and-rename worked');
#4
$row = $slave1_dbh->selectrow_hashref("SELECT f2 FROM test.t2 WHERE id = 1");
is(
$row->{f2},