Merge authors:
Dimitri John Ledkov (xnox)
Related merge proposals:
https://code.launchpad.net/~xnox/upstart/clashing-sockets/+merge/222030
proposed by: Dimitri John Ledkov (xnox)
review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1627 [merge]
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Wed 2014-06-04 14:10:46 +0100
message:
* Merge of lp:~xnox/upstart/clashing-sockets.
modified:
util/tests/test_initctl.c
util/tests/test_sysv.c
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== 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:47:47 +0000
@@ -121,7 +121,7 @@
TEST_ALLOC_FAIL {
use_dbus = FALSE;
dest_name = NULL;
- dest_address = "unix:abstract=/com/ubuntu/upstart/test";
+ dest_address = "unix:abstract=/com/ubuntu/upstart/test_initctl";
TEST_ALLOC_SAFE {
server = nih_dbus_server (dest_address,
=== 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:47:47 +0000
@@ -97,7 +97,7 @@
TEST_FUNCTION ("sysv_change_runlevel");
- dest_address = "unix:abstract=/com/ubuntu/upstart/test";
+ dest_address = "unix:abstract=/com/ubuntu/upstart/test_sysv";
TEST_FILENAME (utmp_file);
TEST_FILENAME (wtmp_file);
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
