Merge lp://qastaging/~patrick-crews/drizzle/dbqp_rpl_tests into lp://qastaging/drizzle/7.0
Proposed by
Patrick Crews
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | 2226 |
| Merged at revision: | 2232 |
| Proposed branch: | lp://qastaging/~patrick-crews/drizzle/dbqp_rpl_tests |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
236 lines (+150/-2) 6 files modified
plugin/slave/tests/r/basic.result (+25/-0) plugin/slave/tests/t/basic.test (+26/-0) plugin/slave/tests/t/master.cnf (+2/-0) tests/include/wait_for_slave_plugin_to_sync.inc (+39/-0) tests/lib/drizzle_test_run/dtr_test_management.py (+51/-2) tests/lib/dtr_cases.pl (+7/-0) |
| To merge this branch: | bzr merge lp://qastaging/~patrick-crews/drizzle/dbqp_rpl_tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Patrick Crews | Approve | ||
|
Review via email:
|
|||
Description of the change
We have altered dbqp's dtr test manager to also look for .cnf files. These will supersede any master.opt files (they shouldn't be used in conjunction anyway).
This allows us a clean, standard syntax for expressing our server allocation needs (as with the randgen)
[server_
[[<server1 options>],[<server2 options>]...]
Also included basic testcase as an example - note we need to use an include file in such tests to ensure the slave is sync'd before we check out the contents of the server - see slave/tests/
To post a comment you must log in.
Revision history for this message
| Patrick Crews (patrick-crews) wrote | # |
Revision history for this message
| Patrick Crews (patrick-crews) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Made a change to test-run.pl so that it will skip a test if it encounters a suite-level master.cnf or $testname.cnf. We use .cnf's for dbqp exclusively and hope they will one day replace master.opt files (single file to contain everything maybe)