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

Remove pt conf files before running Jenkins test else they can cause weird results. Make pt-stalk --collect run-time test more liberal.

Browse Source
This commit is contained in:
Daniel Nichter
2012-10-13 12:58:55 -06:00
parent d04529a64b
commit c060b650f2
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sandbox/jenkins-test
View File

@@ -59,6 +59,12 @@ export PERCONA_TOOLKIT_SANDBOX="$MYSQL_BASE_DIR"
export PATH="$PATH:/usr/sbin:$MYSQL_BASE_DIR/bin" export PATH="$PATH:/usr/sbin:$MYSQL_BASE_DIR/bin"
export LANG="en_US.UTF-8" export LANG="en_US.UTF-8"
# ######################################### #
# Remove conf files that's shouldn't exist. #
# ######################################### #
rm ~/.pt-*conf*
rm ~/.my*
############################# #############################
# Check and start test env. # # Check and start test env. #
############################# #############################

4
t/pt-stalk/pt-stalk.t
View File

@@ -149,9 +149,9 @@ like(
# the samples may not be precisely 1 second apart. # the samples may not be precisely 1 second apart.
chomp($output = `cat $dest/*-df | grep -c '^TS'`); chomp($output = `cat $dest/*-df | grep -c '^TS'`);
ok( ok(
$output >= 1 && $output <= 2, $output >= 1 && $output <= 3,
"Collect ran for --run-time" "Collect ran for --run-time"
); ) or diag("Run time: $output");
ok( ok(
PerconaTest::not_running("pt-stalk --iterations 1"), PerconaTest::not_running("pt-stalk --iterations 1"),