lp:~jamesodhunt/upstart/fix-job_find

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1599

Upstart Reviewers: Pending requested 2013-11-18

Diff: 877 lines (+708/-20)

6 files modified

ChangeLog (+24/-0)
init/control.c (+29/-13)
init/control.h (+6/-5)
init/job.c (+3/-0)
init/tests/test_control.c (+527/-2)
init/tests/test_job.c (+119/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1574. By James Hunt on 2013-11-18

* Sync with lp:upstart.

1573. By James Hunt on 2013-11-18

* init/control.c:
  - control_set_env():
    - Check permissions before anything else.
    - Explicit check on @var rather than an assert.
  - control_unset_env(): Explicit check on @name rather than an assert.
  - control_get_env(): Explicit check on @name.
  - control_reset_env(): Check permissions before anything else.
* init/control.h: control_get_job():
  - Pass @job_name to job_find() rather than hard-coded NULL.
  - Handle instance being NULL when raising NIH D-Bus error.
* init/job.c: job_find(): Handle NULL job_name.
* init/tests/test_control.c:
  - Typo.
  - New functions:
    - test_list_env().
    - test_list_env().
    - test_get_env().
    - test_set_env().
    - test_unset_env().
    - test_reset_env().
* init/tests/test_job.c: test_job_find(): New function.

1572. By James Hunt on 2013-11-14

* NEWS: Begin new release.

1571. By James Hunt on 2013-11-14

* NEWS: Release 1.11.

1570. By James Hunt on 2013-11-13

* Merge of lp:~jamesodhunt/upstart/fix-test_state-test-reprise.

1569. By James Hunt on 2013-11-13

* Merge of lp:~xnox/upstart/xdg-runtime-dir-fixes.

1568. By Dimitri John Ledkov on 2013-11-12

Merge lp:~jamesodhunt/upstart/cleanup-test-xdg-dirs

1567. By Dimitri John Ledkov on 2013-11-11

Unbreak running with non-tap test driver.

1566. By Dimitri John Ledkov on 2013-11-11

Introduce TAP output, mark failing tests as TODO, unset environment
variables that cause test suite failures.

1565. By Dimitri John Ledkov on 2013-11-08

Unset environment variables, to have reproducible test results.