Merge lp:~gz/maas/move_update_hardware_details_tests into lp:~maas-committers/maas/trunk
Proposed by
Martin Packman
Status: | Merged |
---|---|
Approved by: | Martin Packman |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1071 |
Proposed branch: | lp:~gz/maas/move_update_hardware_details_tests |
Merge into: | lp:~maas-committers/maas/trunk |
Prerequisite: | lp:~gz/maas/populate_tags |
Diff against target: |
120 lines (+43/-50) 2 files modified
src/maasserver/tests/test_node.py (+41/-0) src/metadataserver/tests/test_api.py (+2/-50) |
To merge this branch: | bzr merge lp:~gz/maas/move_update_hardware_details_tests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel (community) | Approve | ||
Review via email: mp+126226@code.launchpad.net |
Commit message
Move tests for updating hardware details under maasserver rather than metadataserver
Description of the change
Simple cleanup of tests added in earlier branches. Moves tests that are really about Node to maasserver.
To post a comment you must log in.
Attempt to merge into lp:maas failed due to conflicts:
text conflict in src/metadataser ver/tests/ test_api. py