MAAS

Merge lp://staging/~ltrager/maas/lp1683502 into lp://staging/~maas-committers/maas/trunk

  1. lp1683502
  2. Merge into trunk
Proposed by Lee Trager
Status: Merged
Approved by: Lee Trager
Approved revision: no longer in the source branch.
Merged at revision: 5989
Proposed branch: lp://staging/~ltrager/maas/lp1683502
Merge into: lp://staging/~maas-committers/maas/trunk
Diff against target: 18 lines (+6/-1)
1 file modified
src/maasserver/websockets/handlers/tests/test_machine.py (+6/-1)
To merge this branch: bzr merge lp://staging/~ltrager/maas/lp1683502
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+322649@code.staging.launchpad.net

Commit message

Fix test that assumed ScriptSet.status could be SCRIPT_STATUS.TIMEDOUT

test_dehydrate_script_set_status works by creating a ScriptResult and confirming the dehydrated ScriptSet has the same status. When a ScriptResult is TIMEDOUT out ScriptSet.status returns failed as this causes the Node to go into a failed status.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Thanks for the fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.