Merge lp:~xnox/upstart/missing-errors into lp:upstart/async

[Dimitri John Ledkov]

[James Hunt (jamesodhunt)]

LGTM.

review: Approve

=== modified file 'init/job_process.c'
--- init/job_process.c	2014-06-02 20:29:33 +0000
+++ init/job_process.c	2014-06-03 14:53:11 +0000
@@ -1236,6 +1236,22 @@
 				  err, _("unable to switch security profile: %s"),
 				  strerror (err->errnum)));
 		break;
+	case JOB_PROCESS_ERROR_CGROUP_MGR_CONNECT:
+		err->error.message = NIH_MUST (nih_sprintf (
+				  err, _("unable to connect to CGManager: %s"),
+				  strerror (err->errnum)));
+		break;
+	case JOB_PROCESS_ERROR_CGROUP_SETUP:
+		err->error.message = NIH_MUST (nih_sprintf (
+				  err, _("unable to setup cgroup: %s"),
+				  strerror (err->errnum)));
+		break;
+	case JOB_PROCESS_ERROR_CGROUP_ENTER:
+		err->error.message = NIH_MUST (nih_sprintf (
+				  err, _("unable to enter cgroup: %s"),
+				  strerror (err->errnum)));
+		break;
+
 	default:
 		nih_assert_not_reached ();
 	}
 
=== modified file 'init/tests/test_cgroup.c'
--- init/tests/test_cgroup.c	2014-05-13 09:03:14 +0000
+++ init/tests/test_cgroup.c	2014-06-03 14:53:11 +0000
@@ -330,6 +330,40 @@
 	assert0 (unlink (logfile_name));
 
 	/*******************************************************************/
+	TEST_FEATURE ("Ensure bogus cgroups don't crash init");
+
+	contents = nih_sprintf (NULL, 
+			"cgroup name\n"
+			"\n"
+			"exec echo hello\n");
+	TEST_NE_P (contents, NULL);
+
+	CREATE_FILE (confdir, "cgroup-name.conf", contents);
+
+	logfile_name = NIH_MUST (nih_sprintf (NULL, "%s/%s",
+				logdir,
+				"cgroup-name.log"));
+
+	cmd = nih_sprintf (NULL, "%s status %s 2>&1", get_initctl (), "cgroup-name");
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+	TEST_EQ (lines, 1);
+
+	/* job is not running yet */
+	TEST_EQ_STR (output[0], "cgroup-name stop/waiting");
+	nih_free (output);
+
+	TEST_FALSE (file_exists (logfile_name));
+
+	cmd = nih_sprintf (NULL, "%s start %s 2>&1", get_initctl (), "cgroup-name");
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+	TEST_EQ (lines, 1);
+
+        TEST_EQ_STR (output[0], "initctl: Job failed to start");
+
+	DELETE_FILE (confdir, "cgroup-name.conf");
+	/*******************************************************************/
 
 	STOP_UPSTART (upstart_pid);
 	TEST_DBUS_END (dbus_pid);