Percona Toolkit moved to https://jira.percona.com/projects/PT

Merge lp:~percona-toolkit-dev/percona-toolkit/hackish-fix-for-masterslave-obj-in-tests into lp:percona-toolkit/2.1

  1. hackish-fix-for-masterslave-obj-in-tests
  2. Merge into 2.1
Proposed by Daniel Nichter
Status: Merged
Merged at revision: 348
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/hackish-fix-for-masterslave-obj-in-tests
Merge into: lp:percona-toolkit/2.1
Diff against target: 51 lines (+4/-4)
4 files modified
t/lib/Processlist.t (+1/-1)
t/lib/TableSyncChunk.t (+1/-1)
t/lib/TableSyncNibble.t (+1/-1)
t/lib/TableSyncer.t (+1/-1)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/hackish-fix-for-masterslave-obj-in-tests
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+118001@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) wrote :

This is a terrible hack, but it works for now. Later we'll fix MasterSlave.pm for real.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 't/lib/Processlist.t'
2--- t/lib/Processlist.t 2012-08-01 21:43:03 +0000
3+++ t/lib/Processlist.t 2012-08-02 21:36:20 +0000
4@@ -23,7 +23,7 @@
5 $Data::Dumper::Sortkeys = 1;
6 $Data::Dumper::Quotekeys = 0;
7
8-my $ms = new MasterSlave();
9+my $ms = new MasterSlave(OptionParser=>1,DSNParser=>1,Quoter=>1);
10 my $rsp = new TextResultSetParser();
11 my $pl;
12 my $procs;
13
14=== modified file 't/lib/TableSyncChunk.t'
15--- t/lib/TableSyncChunk.t 2012-07-11 18:21:47 +0000
16+++ t/lib/TableSyncChunk.t 2012-08-02 21:36:20 +0000
17@@ -46,7 +46,7 @@
18
19 my $q = new Quoter();
20 my $tp = new TableParser(Quoter => $q);
21-my $ms = new MasterSlave();
22+my $ms = new MasterSlave(OptionParser=>1,DSNParser=>1,Quoter=>1);
23 my $rr = new Retry();
24 my $chunker = new TableChunker( Quoter => $q, TableParser => $tp );
25 my $checksum = new TableChecksum( Quoter => $q );
26
27=== modified file 't/lib/TableSyncNibble.t'
28--- t/lib/TableSyncNibble.t 2012-07-11 18:21:47 +0000
29+++ t/lib/TableSyncNibble.t 2012-08-02 21:36:20 +0000
30@@ -40,7 +40,7 @@
31 my $mysql = $sb->_use_for('master');
32
33 my $q = new Quoter();
34-my $ms = new MasterSlave();
35+my $ms = new MasterSlave(OptionParser=>1,DSNParser=>1,Quoter=>1);
36 my $tp = new TableParser(Quoter=>$q);
37 my $rr = new Retry();
38
39
40=== modified file 't/lib/TableSyncer.t'
41--- t/lib/TableSyncer.t 2012-07-11 18:21:47 +0000
42+++ t/lib/TableSyncer.t 2012-08-02 21:36:20 +0000
43@@ -79,7 +79,7 @@
44 );
45
46 my $rd = new RowDiff(dbh=>$src_dbh);
47-my $ms = new MasterSlave();
48+my $ms = new MasterSlave(OptionParser=>1,DSNParser=>1,Quoter=>1);
49 my $rt = new Retry();
50 my $checksum = new TableChecksum(
51 Quoter => $q,

Subscribers

People subscribed via source and target branches