Merge lp:~vorlon/upstart/lp.1254326 into lp:upstart

Proposed by Steve Langasek on 2013-11-23
Status: Merged
Merged at revision: 1577
Proposed branch: lp:~vorlon/upstart/lp.1254326
Merge into: lp:upstart
Diff against target: 28 lines (+9/-1)
2 files modified
ChangeLog (+8/-0)
init/tests/test_state.c (+1/-1)
To merge this branch: bzr merge lp:~vorlon/upstart/lp.1254326
Reviewer Review Type Date Requested Status
Dimitri John Ledkov 2013-11-23 Approve on 2013-11-23
Review via email: mp+196428@code.launchpad.net

Description of the change

Fix wrong assumption that SIGUSR1 == 10 in the test code

To post a comment you must log in.
Dimitri John Ledkov (xnox) wrote :

This also fixes the test-case under kFreeBSD.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-11-18 10:31:21 +0000
3+++ ChangeLog 2013-11-23 19:55:40 +0000
4@@ -1,3 +1,11 @@
5+2013-11-23 Steve Langasek <steve.langasek@ubuntu.com>
6+
7+ * init/tests/test_state.c: fix test case to not assume SIGUSR1 == 10;
8+ the numeric value may vary between platforms, what we actually care
9+ about is making sure that the deserialization output matches what
10+ was in the json - so check the numeric value, NOT the symbolic
11+ signal name.
12+
13 2013-11-16 Dmitrijs Ledkovs <xnox@ubuntu.com>
14
15 * init/xdg.c, util/Makefile.am, test/Makefile.am, init/conf.c:
16
17=== modified file 'init/tests/test_state.c'
18--- init/tests/test_state.c 2013-11-18 10:15:36 +0000
19+++ init/tests/test_state.c 2013-11-23 19:55:40 +0000
20@@ -4460,7 +4460,7 @@
21 NIH_HASH_FOREACH (job_classes, iter) {
22 JobClass *class = (JobClass *)iter;
23 if (strcmp (class->name, "whoopsie") == 0) {
24- TEST_EQ (class->reload_signal, SIGUSR1);
25+ TEST_EQ (class->reload_signal, 10);
26 } else
27 TEST_EQ (class->reload_signal, SIGHUP);
28 }

Subscribers

People subscribed via source and target branches