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

PT-2295 - Fix tests on distributions

Browse Source 
- Fixed typo in has_rocksdb variable assignment in lib/bash/report_mysql_info.sh
- Added cleanup to pt-stalk tests
This commit is contained in:
Sveta Smirnova
2024-02-01 13:54:47 +03:00
parent b98b998a2b
commit 7369476a8d
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-mysql-summary
View File

@@ -2571,7 +2571,7 @@ report_mysql_summary () {
fi fi
fi fi
local has_rocksdb=$(cat $dir/mysql-plugins | grep -i 'rocksdb.*active.*storage engine') local has_rocksdb="$(cat $dir/mysql-plugins | grep -i 'rocksdb.*active.*storage engine')"
if [ ! -z "$has_rocksdb" ]; then if [ ! -z "$has_rocksdb" ]; then
section "RocksDB" section "RocksDB"
section_rocksdb "$dir/mysql-variables" "$dir/mysql-status" section_rocksdb "$dir/mysql-variables" "$dir/mysql-status"

2
lib/bash/report_mysql_info.sh
View File

@@ -1547,7 +1547,7 @@ report_mysql_summary () {
fi fi
fi fi
local has_rocksdb=$(cat $dir/mysql-plugins | grep -i 'rocksdb.*active.*storage engine') local has_rocksdb="$(cat $dir/mysql-plugins | grep -i 'rocksdb.*active.*storage engine')"
if [ ! -z "$has_rocksdb" ]; then if [ ! -z "$has_rocksdb" ]; then
section "RocksDB" section "RocksDB"
section_rocksdb "$dir/mysql-variables" "$dir/mysql-status" section_rocksdb "$dir/mysql-variables" "$dir/mysql-status"

1
t/pt-stalk/plugin.t
View File

@@ -70,5 +70,6 @@ foreach my $hook (qw(
diag(`rm $pid_file 2>/dev/null`); diag(`rm $pid_file 2>/dev/null`);
diag(`rm $log_file 2>/dev/null`); diag(`rm $log_file 2>/dev/null`);
diag(`rm -rf $dest 2>/dev/null`); diag(`rm -rf $dest 2>/dev/null`);
$sb->wipe_clean($dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing; done_testing;

1
t/pt-stalk/pt-stalk-replication.t
View File

@@ -78,5 +78,6 @@ is(
cleanup(); cleanup();
$sb->wipe_clean($dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing; done_testing;