Merge lp:~jtv/maas/use-maasserver-testcase into lp:~maas-committers/maas/trunk
Proposed by
Jeroen T. Vermeulen
Status: | Merged |
---|---|
Approved by: | Jeroen T. Vermeulen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 948 |
Proposed branch: | lp:~jtv/maas/use-maasserver-testcase |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
31 lines (+3/-1) 2 files modified
src/maasserver/tests/test_dhcp.py (+1/-1) src/maasserver/tests/test_dns.py (+2/-0) |
To merge this branch: | bzr merge lp:~jtv/maas/use-maasserver-testcase |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+122002@code.launchpad.net |
Commit message
Proper fix for the test_dns.py failures.
Description of the change
Raphael has spotted the test that was using the wrong TestCase class, which led to the database not being reset between tests, which hid configuration problems in test_dns.py. In this branch I make that other test (test_dhcp.py) use the right test case, and fix up the config problems in test_dns.py.
We'll also need to fix the TestCase situation: names should differ, for one. And ideally tests that don't reset the database shouldn't even be allowed to modify it.
Jeroen
To post a comment you must log in.