lp:~xnox/upstart/clashing-sockets

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1627

James Hunt: Approve on 2014-06-04

Diff: 25 lines (+2/-2)

2 files modified

util/tests/test_initctl.c (+1/-1)
util/tests/test_sysv.c (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1625. By Dimitri John Ledkov on 2014-06-04

Make test_sysv & test_initctl use different private sockets.

Under automake's parallel test-harness, when executing make check
target with multiple processes a race exists where both test_sysv &
test_initctl will try to accquire the same private socket
simultaniously. This can be reproduced with "./test_sysv &
./test_initctl" fairly often, and almost always on the buildds. Thus
i'm changing the private socket name used for testing in both test
binaries.

1624. By Dimitri John Ledkov on 2014-06-04

Add debug output in test_sysv, to troubleshoot PPA test failure.

1623. By Dimitri John Ledkov on 2014-06-04

Whitespace fixes

1622. By Dimitri John Ledkov on 2014-06-02

Merge async.

1621. By James Hunt on 2014-05-15

* Merge of lp:~xnox/upstart/reboot-fix.

1620. By James Hunt on 2014-05-08

* Merge of lp:~xnox/upstart/do-not-launch-session-dbus.

1619. By James Hunt on 2014-05-08

* Merge of lp:~jamesodhunt/upstart/fix-deprecated-json-calls.

1618. By James Hunt on 2014-04-24

* init/man/init.5: Further clarification of 'respawn limit'.

1617. By James Hunt on 2014-04-24

* init/man.5:
  - Clarify default behaviour of 'respawn' stanza.
  - Add missing 'respawn limit unlimited' details.

1616. By James Hunt on 2014-04-17

* Merge of lp:~xnox/upstart/empty-session.