Merge lp://staging/~julian-edwards/maas/dont-query-all-nodes-power into lp://staging/~maas-committers/maas/trunk
Proposed by
Julian Edwards
| Status: | Merged |
|---|---|
| Approved by: | Julian Edwards |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 3284 |
| Proposed branch: | lp://staging/~julian-edwards/maas/dont-query-all-nodes-power |
| Merge into: | lp://staging/~maas-committers/maas/trunk |
| Diff against target: |
68 lines (+31/-3) 2 files modified
src/provisioningserver/rpc/power.py (+4/-1) src/provisioningserver/rpc/tests/test_power.py (+27/-2) |
| To merge this branch: | bzr merge lp://staging/~julian-edwards/maas/dont-query-all-nodes-power |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Graham Binns (community) | Approve | ||
| Raphaël Badin (community) | Approve | ||
|
Review via email:
|
|||
Commit message
In the power monitor service, remove any attempt at all to query power types that cannot be queried. Previously it logged a misleading warning about an unknown power type.
Description of the change
The new test is basically a bit of a copy and paste of the existing one. I could have amended that test to keep this brief, but I felt a separate test was better. I didn't refactor it because it reads better as it is and it's only one almost-dupe test, a third would be a definite refactor.
To post a comment you must log in.
Revision history for this message
| Raphaël Badin (rvb) | # |
review:
Approve
Revision history for this message
| Julian Edwards (julian-edwards) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
So for the second time in two days, I approve a branch and Launchpad just gives me an empty JS error box. That's probably a bug, then.
Re-approving out of sheer bloody-mindedness.