Merge authors:
Dmitrijs Ledkovs (xnox)
Related merge proposals:
https://code.launchpad.net/~xnox/upstart/clean-up-processes-reload-action/+merge/181792
proposed by: Dmitrijs Ledkovs (xnox)
------------------------------------------------------------
revno: 1523 [merge]
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Fri 2013-08-23 13:28:47 +0100
message:
* Merge of lp:~xnox/upstart/clean-up-processes-reload-action.
modified:
util/tests/test_initctl.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 2013-08-23 09:22:32 +0000
+++ util/tests/test_initctl.c 2013-08-23 11:23:19 +0000
@@ -8462,7 +8462,6 @@
FILE * output;
FILE * errors;
pid_t server_pid;
- pid_t proc_pid;
DBusMessage * method_call;
DBusMessage * reply = NULL;
const char * name_value;
@@ -8502,10 +8501,6 @@
*/
TEST_FEATURE ("with single argument");
TEST_ALLOC_FAIL {
- TEST_CHILD (proc_pid) {
- pause ();
- }
-
TEST_CHILD (server_pid) {
/* Expect the GetJobByName method call on the
* manager object, make sure the job name is passed
@@ -8635,9 +8630,6 @@
kill (server_pid, SIGTERM);
waitpid (server_pid, NULL, 0);
-
- kill (proc_pid, SIGTERM);
- waitpid (proc_pid, NULL, 0);
continue;
}
@@ -8660,10 +8652,6 @@
*/
TEST_FEATURE ("with multiple arguments");
TEST_ALLOC_FAIL {
- TEST_CHILD (proc_pid) {
- pause ();
- }
-
TEST_CHILD (server_pid) {
/* Expect the GetJobByName method call on the
* manager object, make sure the job name is passed
@@ -8797,9 +8785,6 @@
kill (server_pid, SIGTERM);
waitpid (server_pid, NULL, 0);
-
- kill (proc_pid, SIGTERM);
- waitpid (proc_pid, NULL, 0);
continue;
}
@@ -8827,10 +8812,6 @@
setenv ("UPSTART_INSTANCE", "foo", TRUE);
TEST_ALLOC_FAIL {
- TEST_CHILD (proc_pid) {
- pause ();
- }
-
TEST_CHILD (server_pid) {
/* Expect the GetJobByName method call on the
* manager object, make sure the job name is passed
@@ -8958,9 +8939,6 @@
kill (server_pid, SIGTERM);
waitpid (server_pid, NULL, 0);
-
- kill (proc_pid, SIGTERM);
- waitpid (proc_pid, NULL, 0);
continue;
}
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
