Merge lp:~vorlon/upstart/lp.926473 into lp:~jamesodhunt/upstart/early-job-log-flush

[Steve Langasek]

Unmerged revisions

1359. By Steve Langasek on 2012-02-15

don't let leaked file descriptors from the environment cause the test suite to
fail

=== modified file 'ChangeLog'
--- ChangeLog	2012-02-14 16:47:34 +0000
+++ ChangeLog	2012-02-15 03:29:18 +0000
@@ -1,3 +1,10 @@
[phone]  Steve Langasek  <[e-mail]>
+
+	* init/tests/test_job_process.c:
+	  - close_all_files(): helper function to close all fds above 3
+	  - test_run(): call close_all_files() so that fds leaked from the
+	    testsuite's environment don't cause spurious failures.
+
 2012-02-14  James Hunt  <[e-mail]>
 
 	* dbus/com.ubuntu.Upstart.xml:
 
=== modified file 'init/tests/test_job_process.c'
--- init/tests/test_job_process.c	2012-02-14 16:47:34 +0000
+++ init/tests/test_job_process.c	2012-02-15 03:29:18 +0000
@@ -391,6 +391,22 @@
 	return max - nr;
 }
 
+/* Helper function to close all fds above 2, in case any have been leaked
+ * to us from the environment (and thence to the child process)
+ */
+void
+close_all_files (void)
+{
+	int i;
+	struct rlimit rlim;
+
+	if (getrlimit(RLIMIT_NOFILE, &rlim) < 0)
+		return;
+
+	for (i = 3; i < rlim.rlim_cur; i++)
+		close(i);
+}
+
 /* XXX: Note that none of these tests attempts to test with a Session
  * passed to job_class_new() since to do so would modify the home
  * directory of the user running these tests (BAD!!).
@@ -1106,6 +1122,8 @@
 	 */
 	TEST_EQ (setenv ("UPSTART_LOGDIR", dirname, 1), 0);
 
+	close_all_files();
+
 	/************************************************************/
 	TEST_FEATURE ("ensure sane fds with no console, no script");