From 972c810962e26ac32b6f111fe91efd8fb3affd1b Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Wed, 18 Jan 2017 11:12:07 -0300 Subject: [PATCH] Fixed pt-mysql-summary & pt-upgrade tests --- t/pt-mysql-summary/pt-mysql-summary.t | 2 +- t/pt-mysql-summary/samples/expected_output_temp002.txt | 4 ---- t/pt-mysql-summary/samples/expected_output_temp003.txt | 4 ---- t/pt-mysql-summary/samples/expected_output_temp004.txt | 4 ---- t/pt-mysql-summary/samples/expected_output_temp005.txt | 4 ---- t/pt-mysql-summary/samples/expected_output_temp006.txt | 4 ---- t/pt-mysql-summary/samples/expected_output_temp007.txt | 4 ---- .../samples/003/insert_truncate_warning_results/results | 2 +- 8 files changed, 2 insertions(+), 26 deletions(-) diff --git a/t/pt-mysql-summary/pt-mysql-summary.t b/t/pt-mysql-summary/pt-mysql-summary.t index 48f1c0ae..20c1d46e 100644 --- a/t/pt-mysql-summary/pt-mysql-summary.t +++ b/t/pt-mysql-summary/pt-mysql-summary.t @@ -73,7 +73,7 @@ for my $i (2..7) { no_diff( sub { local $ENV{_NO_FALSE_NEGATIVES} = 1; - print `$env $trunk/bin/$tool --read-samples $trunk/t/pt-mysql-summary/samples/temp00$i -- --defaults-file=/tmp/12345/my.sandbox.cnf | tail -n+3 | perl -wlnpe 's/Skipping schema analysis.*/Specify --databases or --all-databases to dump and summarize schemas/'` + print `$env $trunk/bin/$tool --read-samples $trunk/t/pt-mysql-summary/samples/temp00$i -- --defaults-file=/tmp/12345/my.sandbox.cnf | tail -n+3 | perl -wlnpe 's/Skipping schema analysis.*/Specify --databases or --all-databases to dump and summarize schemas/' | grep -v jemalloc` }, "t/pt-mysql-summary/samples/expected_output_temp00$i.txt", ), diff --git a/t/pt-mysql-summary/samples/expected_output_temp002.txt b/t/pt-mysql-summary/samples/expected_output_temp002.txt index d895d220..c2de552c 100644 --- a/t/pt-mysql-summary/samples/expected_output_temp002.txt +++ b/t/pt-mysql-summary/samples/expected_output_temp002.txt @@ -275,8 +275,4 @@ report-port = 12345 log-error = mysqld.log innodb_lock_wait_timeout = 3 # Memory management library ################################## -jemalloc is not enabled in MySQL config for process with ID 20983 -jemalloc is not enabled in MySQL config for process with ID 20874 -jemalloc is not enabled in MySQL config for process with ID 20800 -jemalloc is not enabled in MySQL config for process with ID 2495 # The End #################################################### diff --git a/t/pt-mysql-summary/samples/expected_output_temp003.txt b/t/pt-mysql-summary/samples/expected_output_temp003.txt index 9880684b..6b69a004 100644 --- a/t/pt-mysql-summary/samples/expected_output_temp003.txt +++ b/t/pt-mysql-summary/samples/expected_output_temp003.txt @@ -218,8 +218,4 @@ report-port = 12345 log-error = mysqld.log innodb_lock_wait_timeout = 3 # Memory management library ################################## -jemalloc is not enabled in MySQL config for process with ID 20983 -jemalloc is not enabled in MySQL config for process with ID 20874 -jemalloc is not enabled in MySQL config for process with ID 20800 -jemalloc is not enabled in MySQL config for process with ID 2495 # The End #################################################### diff --git a/t/pt-mysql-summary/samples/expected_output_temp004.txt b/t/pt-mysql-summary/samples/expected_output_temp004.txt index 73882864..82492fa8 100644 --- a/t/pt-mysql-summary/samples/expected_output_temp004.txt +++ b/t/pt-mysql-summary/samples/expected_output_temp004.txt @@ -217,8 +217,4 @@ report-port = 12345 log-error = mysqld.log innodb_lock_wait_timeout = 3 # Memory management library ################################## -jemalloc is not enabled in MySQL config for process with ID 20983 -jemalloc is not enabled in MySQL config for process with ID 20874 -jemalloc is not enabled in MySQL config for process with ID 20800 -jemalloc is not enabled in MySQL config for process with ID 2495 # The End #################################################### diff --git a/t/pt-mysql-summary/samples/expected_output_temp005.txt b/t/pt-mysql-summary/samples/expected_output_temp005.txt index 7afa6a1b..b72db51d 100644 --- a/t/pt-mysql-summary/samples/expected_output_temp005.txt +++ b/t/pt-mysql-summary/samples/expected_output_temp005.txt @@ -290,8 +290,4 @@ report-port = 12345 log-error = mysqld.log innodb_lock_wait_timeout = 3 # Memory management library ################################## -jemalloc is not enabled in MySQL config for process with ID 20983 -jemalloc is not enabled in MySQL config for process with ID 20874 -jemalloc is not enabled in MySQL config for process with ID 20800 -jemalloc is not enabled in MySQL config for process with ID 2495 # The End #################################################### diff --git a/t/pt-mysql-summary/samples/expected_output_temp006.txt b/t/pt-mysql-summary/samples/expected_output_temp006.txt index 7da43b50..e82e85e9 100644 --- a/t/pt-mysql-summary/samples/expected_output_temp006.txt +++ b/t/pt-mysql-summary/samples/expected_output_temp006.txt @@ -339,8 +339,4 @@ log_queries_not_using_indexes | OFF # Configuration File ######################################### Config File | Cannot autodetect or find, giving up # Memory management library ################################## -jemalloc is not enabled in MySQL config for process with ID 20983 -jemalloc is not enabled in MySQL config for process with ID 20874 -jemalloc is not enabled in MySQL config for process with ID 20800 -jemalloc is not enabled in MySQL config for process with ID 2495 # The End #################################################### diff --git a/t/pt-mysql-summary/samples/expected_output_temp007.txt b/t/pt-mysql-summary/samples/expected_output_temp007.txt index ddf6261e..40f0d9bf 100644 --- a/t/pt-mysql-summary/samples/expected_output_temp007.txt +++ b/t/pt-mysql-summary/samples/expected_output_temp007.txt @@ -293,8 +293,4 @@ log_queries_not_using_indexes | OFF # Configuration File ######################################### Config File | Cannot autodetect or find, giving up # Memory management library ################################## -jemalloc is not enabled in MySQL config for process with ID 20983 -jemalloc is not enabled in MySQL config for process with ID 20874 -jemalloc is not enabled in MySQL config for process with ID 20800 -jemalloc is not enabled in MySQL config for process with ID 2495 # The End #################################################### diff --git a/t/pt-upgrade/samples/003/insert_truncate_warning_results/results b/t/pt-upgrade/samples/003/insert_truncate_warning_results/results index 1ca29dd2..e91a6a0f 100644 --- a/t/pt-upgrade/samples/003/insert_truncate_warning_results/results +++ b/t/pt-upgrade/samples/003/insert_truncate_warning_results/results @@ -1,7 +1,7 @@ $results = { query_time => '0', warnings => { - '1265' => { + 1265 => { code => '1265', level => 'Warning', message => 'Data truncated for column \'username\' at row 1'