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

Fix pt-log-player tests.

Browse Source
This commit is contained in:
Daniel Nichter
2011-07-14 11:37:49 -06:00
parent 716f05e451
commit 31398457f4
18 changed files with 235 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/PerconaTest.pm
View File

@@ -483,6 +483,10 @@ sub no_diff {
`sed $sed_args $tmp_file`; `sed $sed_args $tmp_file`;
} }
} }
if ( defined(my $sort_args = $args{sort}) ) {
`cat $tmp_file | sort $sort_args > $tmp_file-2`;
`mv $tmp_file-2 $tmp_file`;
}
# diff the outputs. # diff the outputs.
my $retval = system("diff $tmp_file $expected_output"); my $retval = system("diff $tmp_file $expected_output");

2
t/pt-log-player/play.t
View File

@@ -32,7 +32,6 @@ my $cmd = "$trunk/bin/pt-log-player --play $tmpdir -F /tmp/12345/my.sandbox.cnf
diag(`rm -rf $tmpdir 2>/dev/null; mkdir $tmpdir`); diag(`rm -rf $tmpdir 2>/dev/null; mkdir $tmpdir`);
# ############################################################################# # #############################################################################
# Test that all session files gets assigned. # Test that all session files gets assigned.
# ############################################################################# # #############################################################################
@@ -43,6 +42,7 @@ for my $n ( 1..16 ) {
sub { pt_log_player::main(@args, '--threads', $n) }, sub { pt_log_player::main(@args, '--threads', $n) },
"t/pt-log-player/samples/assigned16-$n.txt", "t/pt-log-player/samples/assigned16-$n.txt",
trf => "sed -e 's!$trunk/t/pt-log-player/samples/16sessions/!!g'", trf => "sed -e 's!$trunk/t/pt-log-player/samples/16sessions/!!g'",
sort => '',
), ),
"Assigned 16 sessions to $n threads" "Assigned 16 sessions to $n threads"
); );

20
t/pt-log-player/samples/assigned16-1.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s01
Process 0 plays s03
Process 0 plays s08
Process 0 plays s06
Process 0 plays s11
Process 0 plays s02 Process 0 plays s02
Process 0 plays s15 Process 0 plays s03
Process 0 plays s07
Process 0 plays s13
Process 0 plays s04 Process 0 plays s04
Process 0 plays s05 Process 0 plays s05
Process 0 plays s12 Process 0 plays s06
Process 0 plays s07
Process 0 plays s08
Process 0 plays s09 Process 0 plays s09
Process 0 plays s10
Process 0 plays s11
Process 0 plays s12
Process 0 plays s13
Process 0 plays s14 Process 0 plays s14
Process 0 plays s01 Process 0 plays s15
Process 0 plays s16 Process 0 plays s16

32
t/pt-log-player/samples/assigned16-10.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s06
Process 0 plays s05 Process 0 plays s16
Process 1 plays s03 Process 1 plays s05
Process 1 plays s12 Process 1 plays s15
Process 2 plays s08 Process 2 plays s04
Process 2 plays s09 Process 2 plays s14
Process 3 plays s06 Process 3 plays s03
Process 3 plays s14 Process 3 plays s13
Process 4 plays s11 Process 4 plays s02
Process 4 plays s01 Process 4 plays s12
Process 5 plays s02 Process 5 plays s01
Process 5 plays s16 Process 5 plays s11
Process 6 plays s15 Process 6 plays s10
Process 7 plays s07 Process 7 plays s09
Process 8 plays s13 Process 8 plays s08
Process 9 plays s04 Process 9 plays s07

30
t/pt-log-player/samples/assigned16-11.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s05
Process 0 plays s12 Process 0 plays s16
Process 1 plays s03 Process 1 plays s04
Process 1 plays s09 Process 1 plays s15
Process 2 plays s08 Process 10 plays s06
Process 2 plays s03
Process 2 plays s14 Process 2 plays s14
Process 3 plays s06 Process 3 plays s02
Process 3 plays s01 Process 3 plays s13
Process 4 plays s11 Process 4 plays s01
Process 4 plays s16 Process 4 plays s12
Process 5 plays s02 Process 5 plays s11
Process 6 plays s15 Process 6 plays s10
Process 7 plays s07 Process 7 plays s09
Process 8 plays s13 Process 8 plays s08
Process 9 plays s04 Process 9 plays s07
Process 10 plays s05

30
t/pt-log-player/samples/assigned16-12.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s04
Process 0 plays s09 Process 0 plays s16
Process 1 plays s03 Process 1 plays s03
Process 1 plays s14 Process 1 plays s15
Process 2 plays s08 Process 10 plays s06
Process 2 plays s01 Process 11 plays s05
Process 3 plays s06 Process 2 plays s02
Process 3 plays s16 Process 2 plays s14
Process 4 plays s11 Process 3 plays s01
Process 5 plays s02 Process 3 plays s13
Process 6 plays s15 Process 4 plays s12
Process 7 plays s07 Process 5 plays s11
Process 8 plays s13 Process 6 plays s10
Process 9 plays s04 Process 7 plays s09
Process 10 plays s05 Process 8 plays s08
Process 11 plays s12 Process 9 plays s07

32
t/pt-log-player/samples/assigned16-13.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s03
Process 0 plays s14 Process 0 plays s16
Process 1 plays s03 Process 1 plays s02
Process 1 plays s01 Process 1 plays s15
Process 2 plays s08 Process 10 plays s06
Process 2 plays s16 Process 11 plays s05
Process 3 plays s06 Process 12 plays s04
Process 4 plays s11 Process 2 plays s01
Process 5 plays s02 Process 2 plays s14
Process 6 plays s15 Process 3 plays s13
Process 7 plays s07 Process 4 plays s12
Process 8 plays s13 Process 5 plays s11
Process 9 plays s04 Process 6 plays s10
Process 10 plays s05 Process 7 plays s09
Process 11 plays s12 Process 8 plays s08
Process 12 plays s09 Process 9 plays s07

32
t/pt-log-player/samples/assigned16-14.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s02
Process 0 plays s01 Process 0 plays s16
Process 1 plays s03 Process 1 plays s01
Process 1 plays s16 Process 1 plays s15
Process 2 plays s08 Process 10 plays s06
Process 3 plays s06 Process 11 plays s05
Process 4 plays s11 Process 12 plays s04
Process 5 plays s02 Process 13 plays s03
Process 6 plays s15 Process 2 plays s14
Process 7 plays s07 Process 3 plays s13
Process 8 plays s13 Process 4 plays s12
Process 9 plays s04 Process 5 plays s11
Process 10 plays s05 Process 6 plays s10
Process 11 plays s12 Process 7 plays s09
Process 12 plays s09 Process 8 plays s08
Process 13 plays s14 Process 9 plays s07

30
t/pt-log-player/samples/assigned16-15.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s01
Process 0 plays s16 Process 0 plays s16
Process 1 plays s03 Process 1 plays s15
Process 2 plays s08 Process 10 plays s06
Process 3 plays s06 Process 11 plays s05
Process 4 plays s11 Process 12 plays s04
Process 5 plays s02 Process 13 plays s03
Process 6 plays s15 Process 14 plays s02
Process 7 plays s07 Process 2 plays s14
Process 8 plays s13 Process 3 plays s13
Process 9 plays s04 Process 4 plays s12
Process 10 plays s05 Process 5 plays s11
Process 11 plays s12 Process 6 plays s10
Process 12 plays s09 Process 7 plays s09
Process 13 plays s14 Process 8 plays s08
Process 14 plays s01 Process 9 plays s07

32
t/pt-log-player/samples/assigned16-16.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s16
Process 1 plays s03 Process 1 plays s15
Process 2 plays s08 Process 10 plays s06
Process 3 plays s06 Process 11 plays s05
Process 4 plays s11 Process 12 plays s04
Process 5 plays s02 Process 13 plays s03
Process 6 plays s15 Process 14 plays s02
Process 7 plays s07 Process 15 plays s01
Process 8 plays s13 Process 2 plays s14
Process 9 plays s04 Process 3 plays s13
Process 10 plays s05 Process 4 plays s12
Process 11 plays s12 Process 5 plays s11
Process 12 plays s09 Process 6 plays s10
Process 13 plays s14 Process 7 plays s09
Process 14 plays s01 Process 8 plays s08
Process 15 plays s16 Process 9 plays s07

26
t/pt-log-player/samples/assigned16-2.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s02
Process 0 plays s04
Process 0 plays s06
Process 0 plays s08 Process 0 plays s08
Process 0 plays s11 Process 0 plays s10
Process 0 plays s15 Process 0 plays s12
Process 0 plays s13 Process 0 plays s14
Process 0 plays s05 Process 0 plays s16
Process 0 plays s09 Process 1 plays s01
Process 0 plays s01
Process 1 plays s03 Process 1 plays s03
Process 1 plays s06 Process 1 plays s05
Process 1 plays s02
Process 1 plays s07 Process 1 plays s07
Process 1 plays s04 Process 1 plays s09
Process 1 plays s12 Process 1 plays s11
Process 1 plays s14 Process 1 plays s13
Process 1 plays s16 Process 1 plays s15

24
t/pt-log-player/samples/assigned16-3.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s01
Process 0 plays s06
Process 0 plays s15
Process 0 plays s04 Process 0 plays s04
Process 0 plays s09 Process 0 plays s07
Process 0 plays s10
Process 0 plays s13
Process 0 plays s16 Process 0 plays s16
Process 1 plays s03 Process 1 plays s03
Process 1 plays s11 Process 1 plays s06
Process 1 plays s07 Process 1 plays s09
Process 1 plays s05 Process 1 plays s12
Process 1 plays s14 Process 1 plays s15
Process 2 plays s08
Process 2 plays s02 Process 2 plays s02
Process 2 plays s13 Process 2 plays s05
Process 2 plays s12 Process 2 plays s08
Process 2 plays s01 Process 2 plays s11
Process 2 plays s14

30
t/pt-log-player/samples/assigned16-4.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s04
Process 0 plays s11 Process 0 plays s08
Process 0 plays s13 Process 0 plays s12
Process 0 plays s09 Process 0 plays s16
Process 1 plays s03 Process 1 plays s03
Process 1 plays s02 Process 1 plays s07
Process 1 plays s04 Process 1 plays s11
Process 1 plays s14 Process 1 plays s15
Process 2 plays s08 Process 2 plays s02
Process 2 plays s15 Process 2 plays s06
Process 2 plays s05 Process 2 plays s10
Process 2 plays s01 Process 2 plays s14
Process 3 plays s06 Process 3 plays s01
Process 3 plays s07 Process 3 plays s05
Process 3 plays s12 Process 3 plays s09
Process 3 plays s16 Process 3 plays s13

24
t/pt-log-player/samples/assigned16-5.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s01
Process 0 plays s02 Process 0 plays s06
Process 0 plays s05 Process 0 plays s11
Process 0 plays s16 Process 0 plays s16
Process 1 plays s03 Process 1 plays s05
Process 1 plays s10
Process 1 plays s15 Process 1 plays s15
Process 1 plays s12 Process 2 plays s04
Process 2 plays s08
Process 2 plays s07
Process 2 plays s09 Process 2 plays s09
Process 3 plays s06 Process 2 plays s14
Process 3 plays s03
Process 3 plays s08
Process 3 plays s13 Process 3 plays s13
Process 3 plays s14 Process 4 plays s02
Process 4 plays s11 Process 4 plays s07
Process 4 plays s04 Process 4 plays s12
Process 4 plays s01

26
t/pt-log-player/samples/assigned16-6.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s04
Process 0 plays s10 Process 0 plays s10
Process 0 plays s15 Process 0 plays s16
Process 0 plays s09
Process 1 plays s03 Process 1 plays s03
Process 1 plays s07 Process 1 plays s09
Process 1 plays s14 Process 1 plays s15
Process 2 plays s02
Process 2 plays s08 Process 2 plays s08
Process 2 plays s13 Process 2 plays s14
Process 2 plays s01 Process 3 plays s01
Process 3 plays s06 Process 3 plays s07
Process 3 plays s04 Process 3 plays s13
Process 3 plays s16 Process 4 plays s06
Process 4 plays s11 Process 4 plays s12
Process 4 plays s05 Process 5 plays s05
Process 5 plays s02 Process 5 plays s11
Process 5 plays s12

28
t/pt-log-player/samples/assigned16-7.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s02
Process 0 plays s07 Process 0 plays s09
Process 0 plays s01 Process 0 plays s16
Process 1 plays s03 Process 1 plays s01
Process 1 plays s13 Process 1 plays s08
Process 1 plays s16 Process 1 plays s15
Process 2 plays s08 Process 2 plays s07
Process 2 plays s04 Process 2 plays s14
Process 3 plays s06 Process 3 plays s06
Process 3 plays s05 Process 3 plays s13
Process 4 plays s11 Process 4 plays s05
Process 4 plays s12 Process 4 plays s12
Process 5 plays s02 Process 5 plays s04
Process 5 plays s09 Process 5 plays s11
Process 6 plays s15 Process 6 plays s03
Process 6 plays s14 Process 6 plays s10

32
t/pt-log-player/samples/assigned16-8.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s08
Process 0 plays s13 Process 0 plays s16
Process 1 plays s03 Process 1 plays s07
Process 1 plays s04 Process 1 plays s15
Process 2 plays s08 Process 2 plays s06
Process 2 plays s05 Process 2 plays s14
Process 3 plays s06 Process 3 plays s05
Process 3 plays s12 Process 3 plays s13
Process 4 plays s11 Process 4 plays s04
Process 4 plays s09 Process 4 plays s12
Process 5 plays s02 Process 5 plays s03
Process 5 plays s14 Process 5 plays s11
Process 6 plays s15 Process 6 plays s02
Process 6 plays s01 Process 6 plays s10
Process 7 plays s07 Process 7 plays s01
Process 7 plays s16 Process 7 plays s09

30
t/pt-log-player/samples/assigned16-9.txt
View File

@@ -1,17 +1,17 @@
Found 16 session files. Found 16 session files.
Process 0 plays s10 Process 0 plays s07
Process 0 plays s04 Process 0 plays s16
Process 1 plays s03 Process 1 plays s06
Process 1 plays s05 Process 1 plays s15
Process 2 plays s08 Process 2 plays s05
Process 2 plays s12 Process 2 plays s14
Process 3 plays s06 Process 3 plays s04
Process 3 plays s09 Process 3 plays s13
Process 4 plays s11 Process 4 plays s03
Process 4 plays s14 Process 4 plays s12
Process 5 plays s02 Process 5 plays s02
Process 5 plays s01 Process 5 plays s11
Process 6 plays s15 Process 6 plays s01
Process 6 plays s16 Process 6 plays s10
Process 7 plays s07 Process 7 plays s09
Process 8 plays s13 Process 8 plays s08