Merge lp:~xnox/upstart/clashing-sockets into lp:upstart

Proposed by Dimitri John Ledkov on 2014-06-04
Status: Merged
Merged at revision: 1627
Proposed branch: lp:~xnox/upstart/clashing-sockets
Merge into: lp:upstart
Diff against target: 25 lines (+2/-2)
2 files modified
util/tests/test_initctl.c (+1/-1)
util/tests/test_sysv.c (+1/-1)
To merge this branch: bzr merge lp:~xnox/upstart/clashing-sockets
Reviewer Review Type Date Requested Status
James Hunt 2014-06-04 Approve on 2014-06-04
Review via email: mp+222030@code.launchpad.net
To post a comment you must log in.
James Hunt (jamesodhunt) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'util/tests/test_initctl.c'
2--- util/tests/test_initctl.c 2014-05-20 15:04:15 +0000
3+++ util/tests/test_initctl.c 2014-06-04 12:53:05 +0000
4@@ -121,7 +121,7 @@
5 TEST_ALLOC_FAIL {
6 use_dbus = FALSE;
7 dest_name = NULL;
8- dest_address = "unix:abstract=/com/ubuntu/upstart/test";
9+ dest_address = "unix:abstract=/com/ubuntu/upstart/test_initctl";
10
11 TEST_ALLOC_SAFE {
12 server = nih_dbus_server (dest_address,
13
14=== modified file 'util/tests/test_sysv.c'
15--- util/tests/test_sysv.c 2014-06-04 12:17:55 +0000
16+++ util/tests/test_sysv.c 2014-06-04 12:53:05 +0000
17@@ -97,7 +97,7 @@
18
19
20 TEST_FUNCTION ("sysv_change_runlevel");
21- dest_address = "unix:abstract=/com/ubuntu/upstart/test";
22+ dest_address = "unix:abstract=/com/ubuntu/upstart/test_sysv";
23
24 TEST_FILENAME (utmp_file);
25 TEST_FILENAME (wtmp_file);

Subscribers

People subscribed via source and target branches