Merge lp://qastaging/~patrick-crews/percona-xtrabackup/qp-reintegrate into lp://qastaging/~akopytov/percona-xtrabackup/trunk-fixed
| Status: | Rejected |
|---|---|
| Rejected by: | Alexey Kopytov |
| Proposed branch: | lp://qastaging/~patrick-crews/percona-xtrabackup/qp-reintegrate |
| Merge into: | lp://qastaging/~akopytov/percona-xtrabackup/trunk-fixed |
| Diff against target: |
5150 lines (+4967/-0) 36 files modified
.bzrignore (+2/-0) test/qp/qp-config.py (+43/-0) test/qp/xtrabackup_main/bug514068_test.py (+189/-0) test/qp/xtrabackup_main/bug606981_test.py (+134/-0) test/qp/xtrabackup_main/bug722638_test.py (+225/-0) test/qp/xtrabackup_main/bug723097_test.py (+124/-0) test/qp/xtrabackup_main/bug729843_test.py (+82/-0) test/qp/xtrabackup_main/bug733663_test.py (+143/-0) test/qp/xtrabackup_main/bug759225_test.py (+142/-0) test/qp/xtrabackup_main/bug766607_test.py (+194/-0) test/qp/xtrabackup_main/bug810269_test.py (+167/-0) test/qp/xtrabackup_main/bug817132_test.py (+137/-0) test/qp/xtrabackup_main/bug884737_test.py (+122/-0) test/qp/xtrabackup_main/galeraInfo_test.py (+108/-0) test/qp/xtrabackup_main/ib_basic_test.py (+114/-0) test/qp/xtrabackup_main/ib_csm_csv_test.py (+120/-0) test/qp/xtrabackup_main/ib_databases_test_disabled.py (+122/-0) test/qp/xtrabackup_main/ib_incremental_test.py (+204/-0) test/qp/xtrabackup_main/ib_nonempty_dir_test.py (+101/-0) test/qp/xtrabackup_main/ib_parallel_test.py (+119/-0) test/qp/xtrabackup_main/ib_rsync_test.py (+126/-0) test/qp/xtrabackup_main/ib_slave_info_test.py (+87/-0) test/qp/xtrabackup_main/ib_slave_test.py (+173/-0) test/qp/xtrabackup_main/ib_specialchar_test.py (+151/-0) test/qp/xtrabackup_main/ib_stream_test.py (+127/-0) test/qp/xtrabackup_main/replacer.py (+18/-0) test/qp/xtrabackup_main/tar4ibd_symlink_test.py (+151/-0) test/qp/xtrabackup_main/xb_defaults_file_test.py (+78/-0) test/qp/xtrabackup_main/xb_export_test.py (+297/-0) test/qp/xtrabackup_main/xb_incremental_compressed_test.py (+219/-0) test/qp/xtrabackup_main/xb_incremental_test.py (+199/-0) test/qp/xtrabackup_main/xb_log_overwrap_test.py (+114/-0) test/qp/xtrabackup_main/xb_part_range_test.py (+205/-0) test/qp/xtrabackup_main/xb_partial_test.py (+178/-0) test/qp/xtrabackup_main/xb_stats_sakila_test.py (+130/-0) test/qp/xtrabackup_main/xb_stats_test.py (+122/-0) |
| To merge this branch: | bzr merge lp://qastaging/~patrick-crews/percona-xtrabackup/qp-reintegrate |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexey Kopytov | Pending | ||
|
Review via email:
|
|||
Description of the change
Altered how we integrate kewpie testing.
We now keep the tests + a system config file in-tree.
The config file tells kewpie what to do / what to look for / what tests to run / etc.
The tests live in-tree to help keep branches + tests in-sync with minimal moving parts.
Still requires a copy of kewpie and could use some make targets, but tests fine on my machine.
| Alexey Kopytov (akopytov) wrote | # |
Unmerged revisions
- 384. By Patrick Crews
-
Clean up ib_slave_test
- 383. By Patrick Crews
-
Updated test cases that were failing. ib_incremental was due to bad porting, but ib_slave appears to be failing due to innodbackupex issues. Have temp. debug / demo code in the test to illustrate the bug. Fixed mistake in project config file. Setting testdir isn't good : (
- 382. By Patrick Crews
-
Minor fix for subunit output in config module
- 381. By Patrick Crews
-
Tweaked kewpie integration. Now tests will live inside the tree to remain up-to-date with the project. Kewpie itself will live externally
- 380. By Alexey Kopytov
-
Cherrypick of bugfix for bug #907147.
- 379. By Alexey Kopytov
-
Null-merged all missing 1.6 revisions after cherrypicking from the kewpie branch.
- 378. By Alexey Kopytov
-
Cherrypick of bugfix for: Bug #891496: tar4ibd crashes on multi-file tablespace files.
- 377. By Alexey Kopytov
-
Cherrypick of bug826632 fix: parallel option breaks incremental backups
- 376. By Alexey Kopytov
-
Cherrypick of bugfix 759701: innobackupex doesn't copy non-innodb files when applying incremental backup.
- 375. By Alexey Kopytov
-
Cherrypick of fix for bug #711207.
Superseded by https:/