upstart

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

  1. clashing-sockets
  2. Merge into trunk
Proposed by Dimitri John Ledkov
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 Approve
Review via email: mp+222030@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Hunt (jamesodhunt) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'util/tests/test_initctl.c'
--- util/tests/test_initctl.c 2014-05-20 15:04:15 +0000
+++ util/tests/test_initctl.c 2014-06-04 12:53:05 +0000
@@ -121,7 +121,7 @@
121 TEST_ALLOC_FAIL {121 TEST_ALLOC_FAIL {
122 use_dbus = FALSE;122 use_dbus = FALSE;
123 dest_name = NULL;123 dest_name = NULL;
124 dest_address = "unix:abstract=/com/ubuntu/upstart/test";124 dest_address = "unix:abstract=/com/ubuntu/upstart/test_initctl";
125125
126 TEST_ALLOC_SAFE {126 TEST_ALLOC_SAFE {
127 server = nih_dbus_server (dest_address,127 server = nih_dbus_server (dest_address,
128128
=== modified file 'util/tests/test_sysv.c'
--- util/tests/test_sysv.c 2014-06-04 12:17:55 +0000
+++ util/tests/test_sysv.c 2014-06-04 12:53:05 +0000
@@ -97,7 +97,7 @@
9797
9898
99 TEST_FUNCTION ("sysv_change_runlevel");99 TEST_FUNCTION ("sysv_change_runlevel");
100 dest_address = "unix:abstract=/com/ubuntu/upstart/test";100 dest_address = "unix:abstract=/com/ubuntu/upstart/test_sysv";
101101
102 TEST_FILENAME (utmp_file);102 TEST_FILENAME (utmp_file);
103 TEST_FILENAME (wtmp_file);103 TEST_FILENAME (wtmp_file);

Subscribers

People subscribed via source and target branches