Merge lp://staging/~brendan-donegan/maas/qa-lab-tests_fix_test_list_fabrics into lp://staging/~maas-committers/maas/trunk
Proposed by
Brendan Donegan
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~brendan-donegan/maas/qa-lab-tests_fix_test_list_fabrics |
| Merge into: | lp://staging/~maas-committers/maas/trunk |
| Diff against target: |
1672 lines (+1609/-0) (has conflicts) 12 files modified
.bzrignore (+1/-0) HACKING.md (+25/-0) Makefile (+8/-0) cluster-controller-integration.py (+62/-0) config.py (+114/-0) control (+3/-0) maas-cluster-controller-package-test (+13/-0) maas-integration.py (+1135/-0) maas-package-test (+8/-0) timeout.py (+29/-0) update_changelog.py (+20/-0) utils.py (+191/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict adding file Makefile. Moved existing file to Makefile.moved. |
| To merge this branch: | bzr merge lp://staging/~brendan-donegan/maas/qa-lab-tests_fix_test_list_fabrics |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| MAAS Maintainers | Pending | ||
|
Review via email:
|
|||
Description of the change
Generalise the list_fabrics test to allow the test to pass if for example the MAAS created fabrics are numbered 0 and 3. It was agreed to still limit this to a single digit though as if they are numbered 0 and 10 or higher for example then something has probably got out of hand.
To post a comment you must log in.
Unmerged revisions
- 438. By Brendan Donegan
-
Anchor regex to end of string
- 437. By Brendan Donegan
-
Merged from trunk
- 436. By Brendan Donegan
-
Allow MAAS created fabrics to match any number
- 435. By Brendan Donegan
- 434. By Brendan Donegan
-
Merge qa-lab-
tests_write_ xml_to_ adt_artifacts - 433. By Brendan Donegan
-
Merged qa-lab-
tests-with- xunit branch - 432. By Andres Rodriguez
-
Fix various tests for 2.0
- 431. By Andres Rodriguez
-
one more fix
- 430. By Andres Rodriguez
-
disable juju
- 429. By Andres Rodriguez
-
typo
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
