lp:~jamesodhunt/upstart/bug-1288243

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1604

Upstart Reviewers: Pending requested 2014-03-06

Diff: 98 lines (+16/-12)

4 files modified

ChangeLog (+10/-0)
lib/tests/test_libupstart.c (+1/-1)
test/test_util_common.c (+0/-6)
util/tests/test_initctl.c (+5/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1288243: reexec unit test consistently fails: single job producing output across a re-exec

Undecided

Fix Released

Link a bug report

Related blueprints

1604. By James Hunt on 2014-03-06

* lib/tests/test_libupstart.c: Revert to looking for 'init'
  rather than 'test_init'.
* test/test_util_common.c: _start_upstart(): Don't modify argv[0] to
  make the tests inits appear as "test_init" since it breaks the re-exec
  tests (LP: #1288243).
* util/tests/test_initctl.c: Revert to looking for "init' rather than
  'test_init'.

1603. By James Hunt on 2014-03-06

* lib/tests/test_libupstart.c: test_libupstart(): Another init =>
  test_init fix.

1602. By Dimitri John Ledkov on 2014-03-05

merge lp:~jamesodhunt/upstart/bug-1222705

1601. By Dimitri John Ledkov on 2014-03-05

update unit test-names expectations, init during unit-tests is now named test_init

1600. By Dimitri John Ledkov on 2014-03-05

merge lp:~jamesodhunt/upstart/use-session-init-for-init-checkconf

1599. By Dimitri John Ledkov on 2014-03-05

merge lp:~jamesodhunt/upstart/fix-job_find

1598. By Dimitri John Ledkov on 2014-03-05

Merge lp:~jamesodhunt/upstart/test-upstart-name

1597. By James Hunt on 2014-03-05

* doc/states.dot: Added missing security state.

1596. By James Hunt on 2014-03-05

* Merged lp:~xnox/upstart/pyflakes3.

1595. By Dimitri John Ledkov on 2014-03-05

Merge lp:~jamesodhunt/upstart/fix-python-tests