lp:~jamesodhunt/upstart/cgroups-and-process_data-reexec-test

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1641

Dimitri John Ledkov: Approve on 2014-07-03

Diff: 40729 lines (+19611/-18300)

4 files modified

ChangeLog (+22/-0)
init/job_process.c (+9/-3)
init/tests/data/upstart-1.13.json (+19507/-18278)
init/tests/test_state.c (+73/-19)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1642. By James Hunt on 2014-07-03

* init/job_process.c:
  - job_process_data_serialise(): Serialise status.
  - job_process_data_deserialise(): Deserialise status.
* init/tests/data/upstart-1.13.json: Add missing JobProcessData->status.
* init/tests/test_state.c: test_cgroup_and_process_data_state():
  - Ensure JobProcessData recreated in expected form.

1641. By James Hunt on 2014-07-02

* init/tests/data/upstart-1.13.json: Updated with new content containing
  both more cgroup stanza jobs and a job with a job process whose
  child setup is "in-flight", representing the JobProcessData in the
  JSON as 'process_data'.
* init/tests/test_state.c: test_cgroup_and_process_data_state():
  - Renamed from test_cgroup_state().
  - Made cgroup guards more fine-grainded to ensure this test always
    runs, but only tests cgroup content if built with cgroup support.
  - Pre-process the JSON to pass a valid fd to allow the deserialisation
    of the JobProcessData to succeed.

1640. By James Hunt on 2014-07-01

* init/cgroup.c: cgroup_chown(): Corrected return value details.

1639. By James Hunt on 2014-07-01

* init/cgroup.h: Remove stale comment.

1638. By James Hunt on 2014-06-27

* Merge of lp:~xnox/upstart/do-not-emit-twice.

1637. By James Hunt on 2014-06-12

* Formatting.

1636. By James Hunt on 2014-06-09

* Function header.

1635. By James Hunt on 2014-06-09

* Decrufting.

1634. By Dimitri John Ledkov on 2014-06-05

Merge cgroups work.

1633. By Dimitri John Ledkov on 2014-06-05

Avoid test-suite hang on powerpc.