Merge ~bjornt/maas:bug-2066276-3.4 into maas:3.4
Status: | Merged |
---|---|
Approved by: | Björn Tillenius |
Approved revision: | 6c1e6d871da4e4f2616102f83f35eab120912131 |
Merge reported by: | MAAS Lander |
Merged at revision: | not available |
Proposed branch: | ~bjornt/maas:bug-2066276-3.4 |
Merge into: | maas:3.4 |
Diff against target: |
110 lines (+28/-6) 4 files modified
src/maasserver/forms/tests/test_bootresource.py (+1/-0) src/provisioningserver/utils/network.py (+9/-1) src/provisioningserver/utils/tests/test_network.py (+13/-3) utilities/run-py-tests-ci (+5/-2) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
MAAS Lander | Needs Fixing | ||
Björn Tillenius | Approve | ||
Review via email: mp+466218@code.launchpad.net |
Commit message
Bug #2066276: ipv6 test failures: AttributeError: 'RRHeader' object has no attribute '_address'
fix: parse DNS results correctly
(cherry picked from commit 4f6ef7d4e2feab5
(cherry picked from commit 557d3f62aa33991
Limit test processes in parallel to 4 by default.
It's possible to change the number of parallel processes by passing
in the MAAS_MAX_
MAAS_MAX_
This aims to reduce the number of intermittent failures in our CI.
(cherry picked from commit b2df4b603143d36
Apply intermittent test failure fix from e4d49a5503.
Self-approve backport