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

[Steve Langasek]

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

[Dimitri John Ledkov (xnox)]

This also fixes the test-case under kFreeBSD.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-11-18 10:31:21 +0000
+++ ChangeLog	2013-11-23 19:55:40 +0000
@@ -1,3 +1,11 @@
[phone]  Steve Langasek  <[e-mail]>
+
+	* init/tests/test_state.c: fix test case to not assume SIGUSR1 == 10;
+	  the numeric value may vary between platforms, what we actually care
+	  about is making sure that the deserialization output matches what
+	  was in the json - so check the numeric value, NOT the symbolic
+	  signal name.
+
 2013-11-16  Dmitrijs Ledkovs  <[e-mail]>
 
 	* init/xdg.c, util/Makefile.am, test/Makefile.am, init/conf.c:
 
=== modified file 'init/tests/test_state.c'
--- init/tests/test_state.c	2013-11-18 10:15:36 +0000
+++ init/tests/test_state.c	2013-11-23 19:55:40 +0000
@@ -4460,7 +4460,7 @@
 	NIH_HASH_FOREACH (job_classes, iter) {
 		JobClass *class = (JobClass *)iter;
 		if (strcmp (class->name, "whoopsie") == 0) {
-			TEST_EQ (class->reload_signal, SIGUSR1);
+			TEST_EQ (class->reload_signal, 10);
 		} else
 			TEST_EQ (class->reload_signal, SIGHUP);
 	}