Merge lp:~xnox/upstart/clean-up-processes-reload-action into lp:upstart

Proposed by Dimitri John Ledkov on 2013-08-23
Status: Merged
Merged at revision: 1523
Proposed branch: lp:~xnox/upstart/clean-up-processes-reload-action
Merge into: lp:upstart
Diff against target: 73 lines (+0/-22)
1 file modified
util/tests/test_initctl.c (+0/-22)
To merge this branch: bzr merge lp:~xnox/upstart/clean-up-processes-reload-action
Reviewer Review Type Date Requested Status
Upstart Reviewers 2013-08-23 Pending
Review via email: mp+181792@code.launchpad.net
To post a comment you must log in.

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 2013-08-23 09:22:32 +0000
3+++ util/tests/test_initctl.c 2013-08-23 11:29:27 +0000
4@@ -8462,7 +8462,6 @@
5 FILE * output;
6 FILE * errors;
7 pid_t server_pid;
8- pid_t proc_pid;
9 DBusMessage * method_call;
10 DBusMessage * reply = NULL;
11 const char * name_value;
12@@ -8502,10 +8501,6 @@
13 */
14 TEST_FEATURE ("with single argument");
15 TEST_ALLOC_FAIL {
16- TEST_CHILD (proc_pid) {
17- pause ();
18- }
19-
20 TEST_CHILD (server_pid) {
21 /* Expect the GetJobByName method call on the
22 * manager object, make sure the job name is passed
23@@ -8635,9 +8630,6 @@
24
25 kill (server_pid, SIGTERM);
26 waitpid (server_pid, NULL, 0);
27-
28- kill (proc_pid, SIGTERM);
29- waitpid (proc_pid, NULL, 0);
30 continue;
31 }
32
33@@ -8660,10 +8652,6 @@
34 */
35 TEST_FEATURE ("with multiple arguments");
36 TEST_ALLOC_FAIL {
37- TEST_CHILD (proc_pid) {
38- pause ();
39- }
40-
41 TEST_CHILD (server_pid) {
42 /* Expect the GetJobByName method call on the
43 * manager object, make sure the job name is passed
44@@ -8797,9 +8785,6 @@
45
46 kill (server_pid, SIGTERM);
47 waitpid (server_pid, NULL, 0);
48-
49- kill (proc_pid, SIGTERM);
50- waitpid (proc_pid, NULL, 0);
51 continue;
52 }
53
54@@ -8827,10 +8812,6 @@
55 setenv ("UPSTART_INSTANCE", "foo", TRUE);
56
57 TEST_ALLOC_FAIL {
58- TEST_CHILD (proc_pid) {
59- pause ();
60- }
61-
62 TEST_CHILD (server_pid) {
63 /* Expect the GetJobByName method call on the
64 * manager object, make sure the job name is passed
65@@ -8958,9 +8939,6 @@
66
67 kill (server_pid, SIGTERM);
68 waitpid (server_pid, NULL, 0);
69-
70- kill (proc_pid, SIGTERM);
71- waitpid (proc_pid, NULL, 0);
72 continue;
73 }
74

Subscribers

People subscribed via source and target branches