Merge lp://staging/~vorlon/upstart/stateful-reexec-dont-shape-code-to-impossible-tests into lp://staging/~upstart-devel/upstart/stateful-reexec
Proposed by
Steve Langasek
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~vorlon/upstart/stateful-reexec-dont-shape-code-to-impossible-tests |
| Merge into: | lp://staging/~upstart-devel/upstart/stateful-reexec |
| Diff against target: |
187 lines (+23/-40) 4 files modified
init/blocked.c (+0/-4) init/job_class.c (+0/-8) init/process.c (+0/-4) init/tests/test_state.c (+23/-24) |
| To merge this branch: | bzr merge lp://staging/~vorlon/upstart/stateful-reexec-dont-shape-code-to-impossible-tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Hunt | Pending | ||
|
Review via email:
|
|||
Description of the change
Sorry, resubmitting this merge proposal for the Nth time. For some reason 'bzr lp-propose-merge' keeps ignoring the branch target I give it. :/
To post a comment you must log in.
Unmerged revisions
- 1475. By Steve Langasek
-
error handling was added to the str_to_enum() functions solely to satisfy
the tests, when the tests don't model a real-world invocation. Drop the
extra error handling, and instead add a check that *_str_to_enum() DTRT when
called with a non-NULL string that doesn't match an enum. - 1474. By Steve Langasek
-
grammar nitpicking in code comments
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
