Merge lp:~xnox/upstart/cgroup-states into lp:~jamesodhunt/upstart/cgroups

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

This fixes a bunch of test_job and test_job_process test suite failures. Mostly it's adjusting state expectations in the test-suite, but also fixes JOB_PRE_STOP_SETUP -> JOB_PRE_STOP transition and updates the asserts in the job_process (once we are in the process failure handler, the relevant process has completed the setup and thus is in the "full" state, as far as I understand it)

[lp:~xnox/upstart/cgroup-states]

1605. By Dimitri John Ledkov on 2014-04-07

Actually, it looks like the tests might be broken.

1606. By Dimitri John Ledkov on 2014-04-07

Extend asserts to setup stages

[Dimitri John Ledkov (xnox)]

so running under cgmanager in a container i notice that jobs do not progress from *_SETUP -> * states.
Also process tracking with e.g. expect stop did not work it seems (well, i've kill -s CONT a few processes to get the container booting)

I am now leaning to believe that stats in job_process.c (e.g. PROCESS_PRE_STOP) should assert state JOB_PRE_STOP. And that it's buggy behavior for jobs to get stuck in _SETUP state and not transition to the full one. (when cgroups stanza is specified that is)

[Dimitri John Ledkov (xnox)]

I've tested all but "security" and "pre-stop" processes and they all get cgroups containment now.

[lp:~xnox/upstart/cgroup-states]

1607. By Dimitri John Ledkov on 2014-04-08

We need to both SIGCONT & switch to next state for 'expect stop' and setup states.

[Dimitri John Ledkov (xnox)]

With -r1607 i get correct transitions from *_SETUP -> * states.

However, expect stop jobs are still stuck in "setup" and do not transition to running. Investigating.

[lp:~xnox/upstart/cgroup-states]

1608. By Dimitri John Ledkov on 2014-04-08

SIGCONT in setup as well.

[Dimitri John Ledkov (xnox)]

Now the states progress to quickly, e.g. we jump to spawning the main process and running, ahead of pre-start process completing, if and only if cgroups stanza is specified in the job.

[lp:~xnox/upstart/cgroup-states]

1609. By Dimitri John Ledkov on 2014-04-08

Merge pythonic CGManager

1610. By Dimitri John Ledkov on 2014-04-08

Add pyupstart CGManager tests

1611. By Dimitri John Ledkov on 2014-04-08

And kaboom!

Unmerged revisions

1611. By Dimitri John Ledkov on 2014-04-08

And kaboom!

1610. By Dimitri John Ledkov on 2014-04-08

Add pyupstart CGManager tests

1609. By Dimitri John Ledkov on 2014-04-08

Merge pythonic CGManager

1608. By Dimitri John Ledkov on 2014-04-08

SIGCONT in setup as well.

1607. By Dimitri John Ledkov on 2014-04-08

We need to both SIGCONT & switch to next state for 'expect stop' and setup states.

1606. By Dimitri John Ledkov on 2014-04-07

Extend asserts to setup stages

1605. By Dimitri John Ledkov on 2014-04-07

Actually, it looks like the tests might be broken.

1604. By Dimitri John Ledkov on 2014-04-07

Fix up cgroup-states.

1603. By Dimitri John Ledkov on 2014-04-07

Remove debug

=== modified file 'init/job.c'
--- init/job.c	2014-04-04 18:42:18 +0000
+++ init/job.c	2014-04-08 20:51:56 +0000
@@ -278,8 +278,6 @@
 {
 	nih_assert (job != NULL);
 
-	nih_message ("XXX:%s:%d: ", __func__, __LINE__);
-
 	if (job->goal == goal)
 		return;
 
@@ -348,9 +346,6 @@
 {
 	nih_assert (job != NULL);
 
-	nih_message ("XXX:%s:%d:job '%s': goal=%s, state=%s, new state=%s", __func__, __LINE__,
-			job_name (job), job_goal_name (job->goal), job_state_name (job->state), job_state_name (state));
-
 	while (job->state != state) {
 		JobState old_state;
 		int      unused;
@@ -363,9 +358,6 @@
 		old_state = job->state;
 		job->state = state;
 
-		nih_message ("XXX:%s:%d:job '%s': goal=%s, state=%s, old state=%s", __func__, __LINE__,
-				job_name (job), job_goal_name (job->goal), job_state_name (job->state), job_state_name (old_state));
-
 		NIH_LIST_FOREACH (control_conns, iter) {
 			NihListEntry   *entry = (NihListEntry *)iter;
 			DBusConnection *conn = (DBusConnection *)entry->data;
@@ -673,8 +665,6 @@
 {
 	nih_assert (job != NULL);
 
-	nih_message ("XXX:%s:%d: ", __func__, __LINE__);
-
 	switch (job->state) {
 	case JOB_WAITING:
 		switch (job->goal) {
@@ -789,7 +779,7 @@
 	case JOB_PRE_STOP_SETUP:
 		switch (job->goal) {
 		case JOB_STOP:
-			return JOB_STOPPING;
+			return JOB_PRE_STOP;
 		case JOB_START:
 			return JOB_PRE_STOP;
 		case JOB_RESPAWN:
 
=== modified file 'init/job_process.c'
--- init/job_process.c	2014-04-04 18:42:18 +0000
+++ init/job_process.c	2014-04-08 20:51:56 +0000
@@ -199,8 +199,6 @@
 
 	nih_assert (job != NULL);
 
-	nih_message ("XXX:%s:%d: ", __func__, __LINE__);
-
 	proc = job->class->process[process];
 	nih_assert (proc != NULL);
 	nih_assert (proc->command != NULL);
@@ -449,8 +447,6 @@
 	int                cgroups_needed = FALSE;
 #endif /* ENABLE_CGROUPS */
 
-	//nih_message ("XXX:%s:%d: ", __func__, __LINE__);
-
 	nih_assert (job != NULL);
 	nih_assert (job->class != NULL);
 	nih_assert (job->log != NULL);
@@ -950,11 +946,8 @@
 			/* Signal to parent that the (final) setup phase
 			 * is complete.
 			 */
-			nih_message ("XXX:%s:%d: raising SIGSTOP to %s process %s pid %d (state=%s)", __func__, __LINE__,
-				job_name (job), process_name (process), getpid(), job_state_name (job->state));fflush (NULL);
 			raise (SIGSTOP);
 		}
-		nih_message ("XXX:%s:%d: ", __func__, __LINE__);
 		
 #endif /* ENABLE_CGROUPS */
 
@@ -964,14 +957,11 @@
 			job_process_error_abort (fds[1], JOB_PROCESS_ERROR_SETGID, 0);
 		}
 
-		nih_message ("XXX:%s:%d: ", __func__, __LINE__);
 		if (job_setuid != (uid_t)-1 && setuid (job_setuid) < 0) {
 			nih_error_raise_system ();
 			job_process_error_abort (fds[1], JOB_PROCESS_ERROR_SETUID, 0);
 		}
-		nih_message ("XXX:%s:%d: ", __func__, __LINE__);
 	}
-		nih_message ("XXX:%s:%d: ", __func__, __LINE__);
 
 	/* Reset all the signal handlers back to their default handling so
 	 * the child isn't unexpectedly ignoring any, and so we won't
@@ -980,7 +970,6 @@
 	nih_signal_reset ();
 	sigprocmask (SIG_SETMASK, &orig_set, NULL);
 
-	nih_message ("XXX:%s:%d: ", __func__, __LINE__);
 	/* Notes:
 	 *
 	 * - we can't use pause() here since there would then be no way to
@@ -1003,7 +992,6 @@
 		close (fds[1]);
 		raise (SIGSTOP);
 	}
-	nih_message ("XXX:%s:%d: ", __func__, __LINE__);
 
 #ifdef ENABLE_CGROUPS
 	/* Move the pid into the appropriate cgroups now that 
@@ -1022,17 +1010,14 @@
 	}
 #endif /* ENABLE_CGROUPS */
 
-	nih_message ("XXX:%s:%d: ", __func__, __LINE__);
 	/* Set up a process trace if we need to trace forks */
 	if (trace) {
-	nih_message ("XXX:%s:%d: ", __func__, __LINE__);
 		if (ptrace (PTRACE_TRACEME, 0, NULL, 0) < 0) {
 			nih_error_raise_system();
 			job_process_error_abort (fds[1],
 						 JOB_PROCESS_ERROR_PTRACE, 0);
 		}
 	}
-	nih_message ("XXX:%s:%d: ", __func__, __LINE__);
 
 	/* Execute the process, if we escape from here it failed */
 	if (execvp (argv[0], argv) < 0) {
@@ -1526,9 +1511,6 @@
 
 	nih_assert (pid > 0);
 
-	nih_message ("XXX:%s:%d:pid=%d, event=%x, status=%d", __func__, __LINE__,
-			pid, event, status);
-
 	/* Find the job that an event ocurred for, and identify which of the
 	 * job's process it was.  If we don't know about it, then we simply
 	 * ignore the event.
@@ -1537,9 +1519,6 @@
 	if (! job)
 		return;
 
-	nih_message ("XXX:%s:%d:job '%s': goal=%s, state=%s", __func__, __LINE__,
-			job_name (job), job_goal_name (job->goal), job_state_name (job->state));
-
 	/* Check the job's normal exit clauses to see whether this is a failure
 	 * worth warning about.
 	 */
@@ -1553,7 +1532,6 @@
 
 	switch (event) {
 	case NIH_CHILD_EXITED:
-		nih_message ("XXX:%s:%d:", __func__, __LINE__);
 		/* Child exited; check status to see whether it exited
 		 * normally (zero) or with a non-zero status.
 		 */
@@ -1571,7 +1549,6 @@
 		break;
 	case NIH_CHILD_KILLED:
 	case NIH_CHILD_DUMPED:
-		nih_message ("XXX:%s:%d:", __func__, __LINE__);
 		/* Child was killed by a signal, and maybe dumped core.  We
 		 * store the signal value in the higher byte of status (it's
 		 * safe to do that) to distinguish it from a normal exit
@@ -1592,7 +1569,6 @@
 		job_process_terminated (job, process, status);
 		break;
 	case NIH_CHILD_STOPPED:
-		nih_message ("XXX:%s:%d:", __func__, __LINE__);
 		/* Child was stopped by a signal, make sure it was SIGSTOP
 		 * and not a tty-related signal.
 		 */
@@ -1608,13 +1584,11 @@
 		}
 
 		if (status == SIGSTOP) {
-			nih_message ("XXX:%s:%d:", __func__, __LINE__);
 			job_process_stopped (job, process);
 		}
 
 		break;
 	case NIH_CHILD_CONTINUED:
-		nih_message ("XXX:%s:%d:", __func__, __LINE__);
 		/* Child was continued by a signal.
 		 */
 		sig = nih_signal_to_name (status);
@@ -1629,7 +1603,6 @@
 		}
 		break;
 	case NIH_CHILD_TRAPPED:
-		nih_message ("XXX:%s:%d:", __func__, __LINE__);
 		/* Child received a signal while we were tracing it.  This
 		 * can be a signal raised inside the kernel as a side-effect
 		 * of the trace because the child called fork() or exec();
@@ -1637,29 +1610,23 @@
 		 */
 		if ((job->trace_state == TRACE_NEW)
 		    && (status == SIGTRAP)) {
-			nih_message ("XXX:%s:%d:", __func__, __LINE__);
 			job_process_trace_new (job, process);
 		} else if ((job->trace_state == TRACE_NEW_CHILD)
 			   && (status == SIGSTOP)) {
-			nih_message ("XXX:%s:%d:", __func__, __LINE__);
 			job_process_trace_new_child (job, process);
 		} else {
-			nih_message ("XXX:%s:%d:", __func__, __LINE__);
 			job_process_trace_signal (job, process, status);
 		}
 		break;
 	case NIH_CHILD_PTRACE:
-		nih_message ("XXX:%s:%d:", __func__, __LINE__);
 		/* Child called an important syscall that can modify the
 		 * state of the process trace we hold.
 		 */
 		switch (status) {
 		case PTRACE_EVENT_FORK:
-			nih_message ("XXX:%s:%d:", __func__, __LINE__);
 			job_process_trace_fork (job, process);
 			break;
 		case PTRACE_EVENT_EXEC:
-			nih_message ("XXX:%s:%d:", __func__, __LINE__);
 			job_process_trace_exec (job, process);
 			break;
 		default:
@@ -1697,10 +1664,6 @@
 
 	nih_assert (job != NULL);
 
-	nih_message ("XXX:%s:%d:job '%s': goal=%s, state=%s, process=%s, status=%d", __func__, __LINE__,
-			job_name (job), job_goal_name (job->goal), job_state_name (job->state),
-			process_name (process), status);
-
 	switch (process) {
 	case PROCESS_MAIN:
 		nih_assert ((job->state == JOB_RUNNING)
@@ -1708,7 +1671,9 @@
 			    || (job->state == JOB_KILLED)
 			    || (job->state == JOB_STOPPING)
 			    || (job->state == JOB_POST_START)
+			    || (job->state == JOB_POST_START_SETUP)
 			    || (job->state == JOB_PRE_STOP)
+			    || (job->state == JOB_PRE_STOP_SETUP)
 			    || (job->state == JOB_SETUP));
 
 		/* We don't change the state if we're in post-start and there's
@@ -1800,7 +1765,8 @@
 		stop = TRUE;
 		break;
 	case PROCESS_SECURITY:
-		nih_assert (job->state == JOB_SECURITY_SETUP);
+		nih_assert ((job->state == JOB_SECURITY)
+			    || (job->state == JOB_SECURITY_SETUP));
 
 		/* We should always fail the job if the security profile
 		 * failed to load
@@ -1811,7 +1777,8 @@
 		}
 		break;
 	case PROCESS_PRE_START:
-		nih_assert (job->state == JOB_PRE_START_SETUP);
+		nih_assert ((job->state == JOB_PRE_START)
+			    || (job->state == JOB_PRE_START_SETUP));
 
 		/* If the pre-start script is killed or exits with a status
 		 * other than zero, it's always considered a failure since
@@ -1823,7 +1790,8 @@
 		}
 		break;
 	case PROCESS_POST_START:
-		nih_assert (job->state == JOB_POST_START_SETUP);
+		nih_assert ((job->state == JOB_POST_START)
+			    || (job->state == JOB_POST_START_SETUP));
 
 		/* We always want to change the state when the post-start
 		 * script terminates; if the main process is running, we'll
@@ -1834,7 +1802,8 @@
 		 */
 		break;
 	case PROCESS_PRE_STOP:
-		nih_assert (job->state == JOB_PRE_STOP_SETUP);
+		nih_assert ((job->state == JOB_PRE_STOP)
+			    || (job->state == JOB_PRE_STOP_SETUP));
 
 		/* We always want to change the state when the pre-stop
 		 * script terminates, we either want to go back into running
@@ -1845,7 +1814,8 @@
 		 */
 		break;
 	case PROCESS_POST_STOP:
-		nih_assert (job->state == JOB_POST_STOP_SETUP);
+		nih_assert ((job->state == JOB_POST_STOP)
+			    || (job->state == JOB_POST_STOP_SETUP));
 
 		/* If the post-stop script is killed or exits with a status
 		 * other than zero, it's always considered a failure since
@@ -2022,34 +1992,19 @@
 		break;
 	}
 
-	nih_message ("XXX:%s:%d: job=%s, process=%s, pid %d (state=%s, goal=%s)", __func__, __LINE__,
-			job_name (job), process_name (process), job->pid[process], job_state_name (job->state), job_goal_name (job->goal));
-
 	/* Any process can stop on a signal, but we only care about the
 	 * main process when the state is still spawned and any jobs
 	 * which require (cgroup) setup.
-	 */
-	if (! ((process == PROCESS_MAIN && job->state == JOB_SPAWNED) || setup))
-		return;
-
-	/* Send SIGCONT back and change the state to the next one for
+	 *
+	 * Send SIGCONT back and change the state to the next one for
 	 * 'expect stop' jobs and those that require cgroup setup.
 	 */
-	if (job->class->expect == EXPECT_STOP || (job_needs_cgroups (job) && setup)) {
-		nih_message ("XXX:%s:%d: sending SIGCONT to %s process %s pid %d (state=%s)", __func__, __LINE__,
-				job_name (job), process_name (process), job->pid[process], job_state_name (job->state));
-
+	if (job->class->expect == EXPECT_STOP && process == PROCESS_MAIN
+	    && (job->state == JOB_SETUP || job->state == JOB_SPAWNED)
+	    || (job_needs_cgroups (job) && setup)) {
 		kill (job->pid[process], SIGCONT);
-	}
-
-	if (job->class->expect == EXPECT_STOP && process == PROCESS_MAIN && job->state == JOB_SPAWNED) {
-		nih_message ("XXX:%s:%d: changing state for job %s process %s pid %d (state=%s)", __func__, __LINE__,
-				job_name (job), process_name (process), job->pid[process], job_state_name (job->state));
-
 		job_change_state (job, job_next_state (job));
 	}
-
-	nih_message ("XXX:%s:%d: ", __func__, __LINE__);
 }
 
 
@@ -2072,10 +2027,6 @@
 	nih_assert ((job->trace_state == TRACE_NEW)
 		    || (job->trace_state == TRACE_NEW_CHILD));
 
-	nih_message ("XXX:%s:%d:job '%s': goal=%s, state=%s, process=%s", __func__, __LINE__,
-			job_name (job), job_goal_name (job->goal), job_state_name (job->state),
-			process_name (process));
-
 	/* Any process can get us to trace them, but we only care about the
 	 * main process when the state is still spawned.
 	 */
@@ -2127,10 +2078,6 @@
 	nih_assert (job != NULL);
 	nih_assert (job->trace_state == TRACE_NEW_CHILD);
 
-	nih_message ("XXX:%s:%d:job '%s': goal=%s, state=%s, process=%s", __func__, __LINE__,
-			job_name (job), job_goal_name (job->goal), job_state_name (job->state),
-			process_name (process));
-
 	/* Any process can get us to trace them, but we only care about the
 	 * main process when the state is still spawned.
 	 */
@@ -2176,10 +2123,6 @@
 {
 	nih_assert (job != NULL);
 
-	nih_message ("XXX:%s:%d:job '%s': goal=%s, state=%s, process=%s, signum=%d", __func__, __LINE__,
-			job_name (job), job_goal_name (job->goal), job_state_name (job->state),
-			process_name (process), signum);
-
 	/* Any process can get us to trace them, but we only care about the
 	 * main process when the state is still spawned.
 	 */
@@ -2215,10 +2158,6 @@
 
 	nih_assert (job != NULL);
 
-	nih_message ("XXX:%s:%d:job '%s': goal=%s, state=%s, process=%s", __func__, __LINE__,
-			job_name (job), job_goal_name (job->goal), job_state_name (job->state),
-			process_name (process));
-
 	/* Any process can get us to trace them, but we only care about the
 	 * main process when the state is still spawned.
 	 */
@@ -2287,10 +2226,6 @@
 {
 	nih_assert (job != NULL);
 
-	nih_message ("XXX:%s:%d:job '%s': goal=%s, state=%s, process=%s", __func__, __LINE__,
-			job_name (job), job_goal_name (job->goal), job_state_name (job->state),
-			process_name (process));
-
 	/* Any process can get us to trace them, but we only care about the
 	 * main process when the state is still spawned and we're tracing it.
 	 */
 
=== modified file 'init/tests/test_event.c'
--- init/tests/test_event.c	2013-01-31 17:23:55 +0000
+++ init/tests/test_event.c	2014-04-08 20:51:56 +0000
@@ -1259,7 +1259,7 @@
 		job = (Job *)nih_hash_lookup (class->instances, "");
 
 		TEST_EQ (job->goal, JOB_STOP);
-		TEST_EQ (job->state, JOB_POST_STOP);
+		TEST_EQ (job->state, JOB_POST_STOP_SETUP);
 
 		TEST_GT (job->pid[PROCESS_POST_STOP], 0);
 		waitpid (job->pid[PROCESS_POST_STOP], NULL, 0);
@@ -1335,7 +1335,7 @@
 		job = (Job *)nih_hash_lookup (class->instances, "");
 
 		TEST_EQ (job->goal, JOB_STOP);
-		TEST_EQ (job->state, JOB_POST_STOP);
+		TEST_EQ (job->state, JOB_POST_STOP_SETUP);
 
 		TEST_GT (job->pid[PROCESS_POST_STOP], 0);
 		waitpid (job->pid[PROCESS_POST_STOP], NULL, 0);
@@ -1439,7 +1439,7 @@
 		job = (Job *)nih_hash_lookup (class->instances, "");
 
 		TEST_EQ (job->goal, JOB_STOP);
-		TEST_EQ (job->state, JOB_POST_STOP);
+		TEST_EQ (job->state, JOB_POST_STOP_SETUP);
 
 		TEST_GT (job->pid[PROCESS_POST_STOP], 0);
 		waitpid (job->pid[PROCESS_POST_STOP], NULL, 0);
@@ -1621,7 +1621,7 @@
 		job = (Job *)nih_hash_lookup (class->instances, "");
 
 		TEST_EQ (job->goal, JOB_STOP);
-		TEST_EQ (job->state, JOB_POST_STOP);
+		TEST_EQ (job->state, JOB_POST_STOP_SETUP);
 
 		TEST_GT (job->pid[PROCESS_POST_STOP], 0);
 		waitpid (job->pid[PROCESS_POST_STOP], NULL, 0);
@@ -1980,7 +1980,7 @@
 		event_poll ();
 
 		TEST_EQ (job->goal, JOB_STOP);
-		TEST_EQ (job->state, JOB_POST_STOP);
+		TEST_EQ (job->state, JOB_POST_STOP_SETUP);
 		TEST_GT (job->pid[PROCESS_POST_STOP], 0);
 		TEST_EQ_P (job->blocker, NULL);
 
@@ -2026,7 +2026,7 @@
 		event_poll ();
 
 		TEST_EQ (job->goal, JOB_START);
-		TEST_EQ (job->state, JOB_PRE_START);
+		TEST_EQ (job->state, JOB_PRE_START_SETUP);
 		TEST_GT (job->pid[PROCESS_PRE_START], 0);
 		TEST_EQ_P (job->blocker, NULL);
 
 
=== modified file 'init/tests/test_job.c'
--- init/tests/test_job.c	2013-11-18 16:38:32 +0000
+++ init/tests/test_job.c	2014-04-08 20:51:56 +0000
@@ -1059,10 +1059,10 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_PRE_START);
+		job_change_state (job, JOB_PRE_START_SETUP);
 
 		TEST_EQ (job->goal, JOB_START);
-		TEST_EQ (job->state, JOB_PRE_START);
+		TEST_EQ (job->state, JOB_PRE_START_SETUP);
 		TEST_NE (job->pid[PROCESS_PRE_START], 0);
 
 		waitpid (job->pid[PROCESS_PRE_START], &status, 0);
@@ -1125,7 +1125,7 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_PRE_START);
+		job_change_state (job, JOB_PRE_START_SETUP);
 
 		TEST_EQ (job->goal, JOB_START);
 		TEST_EQ (job->state, JOB_RUNNING);
@@ -1200,7 +1200,7 @@
 		job->exit_status = 0;
 
 		TEST_DIVERT_STDERR (output) {
-			job_change_state (job, JOB_PRE_START);
+			job_change_state (job, JOB_PRE_START_SETUP);
 		}
 		rewind (output);
 
@@ -1284,7 +1284,7 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_SPAWNED);
+		job_change_state (job, JOB_SETUP);
 
 		TEST_EQ (job->goal, JOB_START);
 		TEST_EQ (job->state, JOB_RUNNING);
@@ -1352,7 +1352,7 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_SPAWNED);
+		job_change_state (job, JOB_SETUP);
 
 		TEST_EQ (job->goal, JOB_START);
 		TEST_EQ (job->state, JOB_RUNNING);
@@ -1432,7 +1432,7 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_SPAWNED);
+		job_change_state (job, JOB_SETUP);
 
 		TEST_EQ (job->goal, JOB_START);
 		TEST_EQ (job->state, JOB_RUNNING);
@@ -1507,7 +1507,7 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_SPAWNED);
+		job_change_state (job, JOB_SETUP);
 
 		TEST_EQ (job->goal, JOB_START);
 		TEST_EQ (job->state, JOB_RUNNING);
@@ -1572,7 +1572,7 @@
 		job->exit_status = 0;
 
 		TEST_DIVERT_STDERR (output) {
-			job_change_state (job, JOB_SPAWNED);
+			job_change_state (job, JOB_SETUP);
 		}
 		rewind (output);
 
@@ -1658,10 +1658,10 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_SPAWNED);
+		job_change_state (job, JOB_SETUP);
 
 		TEST_EQ (job->goal, JOB_START);
-		TEST_EQ (job->state, JOB_SPAWNED);
+		TEST_EQ (job->state, JOB_SETUP);
 		TEST_NE (job->pid[PROCESS_MAIN], 0);
 
 		waitpid (job->pid[PROCESS_MAIN], &status, 0);
@@ -1727,10 +1727,10 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_POST_START);
+		job_change_state (job, JOB_POST_START_SETUP);
 
 		TEST_EQ (job->goal, JOB_START);
-		TEST_EQ (job->state, JOB_POST_START);
+		TEST_EQ (job->state, JOB_POST_START_SETUP);
 		TEST_EQ (job->pid[PROCESS_MAIN], 1);
 		TEST_NE (job->pid[PROCESS_POST_START], 0);
 
@@ -1794,7 +1794,7 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_POST_START);
+		job_change_state (job, JOB_POST_START_SETUP);
 
 		TEST_EQ (job->goal, JOB_START);
 		TEST_EQ (job->state, JOB_RUNNING);
@@ -1858,7 +1858,7 @@
 		job->exit_status = 0;
 
 		TEST_DIVERT_STDERR (output) {
-			job_change_state (job, JOB_POST_START);
+			job_change_state (job, JOB_POST_START_SETUP);
 		}
 		rewind (output);
 
@@ -2058,10 +2058,10 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_PRE_STOP);
+		job_change_state (job, JOB_PRE_STOP_SETUP);
 
 		TEST_EQ (job->goal, JOB_STOP);
-		TEST_EQ (job->state, JOB_PRE_STOP);
+		TEST_EQ (job->state, JOB_PRE_STOP_SETUP);
 		TEST_EQ (job->pid[PROCESS_MAIN], 1);
 		TEST_NE (job->pid[PROCESS_PRE_STOP], 0);
 
@@ -2125,7 +2125,7 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_PRE_STOP);
+		job_change_state (job, JOB_PRE_STOP_SETUP);
 
 		TEST_EQ (job->goal, JOB_STOP);
 		TEST_EQ (job->state, JOB_STOPPING);
@@ -2198,7 +2198,7 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_PRE_STOP);
+		job_change_state (job, JOB_PRE_STOP_SETUP);
 
 		TEST_EQ (job->goal, JOB_STOP);
 		TEST_EQ (job->state, JOB_STOPPING);
@@ -2283,7 +2283,7 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_PRE_STOP);
+		job_change_state (job, JOB_PRE_STOP_SETUP);
 
 		TEST_EQ (job->goal, JOB_STOP);
 		TEST_EQ (job->state, JOB_STOPPING);
@@ -2364,7 +2364,7 @@
 		job->exit_status = 0;
 
 		TEST_DIVERT_STDERR (output) {
-			job_change_state (job, JOB_PRE_STOP);
+			job_change_state (job, JOB_PRE_STOP_SETUP);
 		}
 		rewind (output);
 
@@ -3039,7 +3039,7 @@
 		job_change_state (job, JOB_KILLED);
 
 		TEST_EQ (job->goal, JOB_STOP);
-		TEST_EQ (job->state, JOB_POST_STOP);
+		TEST_EQ (job->state, JOB_POST_STOP_SETUP);
 		TEST_NE (job->pid[PROCESS_POST_STOP], 0);
 
 		waitpid (job->pid[PROCESS_POST_STOP], &status, 0);
@@ -3100,10 +3100,10 @@
 		job->failed_process = PROCESS_INVALID;
 		job->exit_status = 0;
 
-		job_change_state (job, JOB_POST_STOP);
+		job_change_state (job, JOB_POST_STOP_SETUP);
 
 		TEST_EQ (job->goal, JOB_STOP);
-		TEST_EQ (job->state, JOB_POST_STOP);
+		TEST_EQ (job->state, JOB_POST_STOP_SETUP);
 		TEST_NE (job->pid[PROCESS_POST_STOP], 0);
 
 		waitpid (job->pid[PROCESS_POST_STOP], &status, 0);
@@ -3168,7 +3168,7 @@
 
 		TEST_FREE_TAG (job);
 
-		job_change_state (job, JOB_POST_STOP);
+		job_change_state (job, JOB_POST_STOP_SETUP);
 
 		TEST_FREE (job);
 
@@ -3228,7 +3228,7 @@
 		TEST_FREE_TAG (job);
 
 		TEST_DIVERT_STDERR (output) {
-			job_change_state (job, JOB_POST_STOP);
+			job_change_state (job, JOB_POST_STOP_SETUP);
 		}
 		rewind (output);
 
@@ -4000,11 +4000,20 @@
 
 
 	/* Check that the next state if we're starting a starting job is
+	 * security setup.
+	 */
+	TEST_FEATURE ("with starting job and a goal of start");
+	job->goal = JOB_START;
+	job->state = JOB_STARTING;
+
+	TEST_EQ (job_next_state (job), JOB_SECURITY_SETUP);
+
+	/* Check that the next state if we're starting a security job is
 	 * security.
 	 */
-	TEST_FEATURE ("with starting job and a goal of start");
+	TEST_FEATURE ("with security job and a goal of start");
 	job->goal = JOB_START;
-	job->state = JOB_STARTING;
+	job->state = JOB_SECURITY_SETUP;
 
 	TEST_EQ (job_next_state (job), JOB_SECURITY);
 
@@ -4015,7 +4024,7 @@
 	job->goal = JOB_START;
 	job->state = JOB_SECURITY;
 
-	TEST_EQ (job_next_state (job), JOB_PRE_START);
+	TEST_EQ (job_next_state (job), JOB_PRE_START_SETUP);
 
 	/* Check that the next state if we're stopping an security job is
 	 * stopping.
@@ -4037,11 +4046,20 @@
 
 
 	/* Check that the next state if we're starting a pre-start job is
+	 * setup.
+	 */
+	TEST_FEATURE ("with pre-start job and a goal of start");
+	job->goal = JOB_START;
+	job->state = JOB_PRE_START;
+
+	TEST_EQ (job_next_state (job), JOB_SETUP);
+
+	/* Check that the next state if we're starting a pre-start job is
 	 * spawned.
 	 */
 	TEST_FEATURE ("with pre-start job and a goal of start");
 	job->goal = JOB_START;
-	job->state = JOB_PRE_START;
+	job->state = JOB_SETUP;
 
 	TEST_EQ (job_next_state (job), JOB_SPAWNED);
 
@@ -4057,11 +4075,20 @@
 
 
 	/* Check that the next state if we're starting a spawned job is
+	 * post-start setup.
+	 */
+	TEST_FEATURE ("with spawned job and a goal of start");
+	job->goal = JOB_START;
+	job->state = JOB_SPAWNED;
+
+	TEST_EQ (job_next_state (job), JOB_POST_START_SETUP);
+
+	/* Check that the next state if we're starting a spawned job is
 	 * post-start.
 	 */
 	TEST_FEATURE ("with spawned job and a goal of start");
 	job->goal = JOB_START;
-	job->state = JOB_SPAWNED;
+	job->state = JOB_POST_START_SETUP;
 
 	TEST_EQ (job_next_state (job), JOB_POST_START);
 
@@ -4098,7 +4125,7 @@
 
 
 	/* Check that the next state if we're stopping a running job is
-	 * pre-stop.  This is the "normal" stop process, as called from the
+	 * pre-stop setup.  This is the "normal" stop process, as called from the
 	 * goal change event.
 	 */
 	TEST_FEATURE ("with running job and a goal of stop");
@@ -4106,6 +4133,17 @@
 	job->state = JOB_RUNNING;
 	job->pid[PROCESS_MAIN] = 1;
 
+	TEST_EQ (job_next_state (job), JOB_PRE_STOP_SETUP);
+
+	/* Check that the next state if we're stopping a running job is
+	 * pre-stop.
+	 */
+	TEST_FEATURE ("with running job and a goal of stop");
+	job->goal = JOB_STOP;
+	job->state = JOB_PRE_STOP_SETUP;
+	job->pid[PROCESS_MAIN] = 1;
+	job->pid[PROCESS_PRE_STOP] = 2;
+
 	TEST_EQ (job_next_state (job), JOB_PRE_STOP);
 
 
@@ -4193,7 +4231,7 @@
 	job->goal = JOB_START;
 	job->state = JOB_KILLED;
 
-	TEST_EQ (job_next_state (job), JOB_POST_STOP);
+	TEST_EQ (job_next_state (job), JOB_POST_STOP_SETUP);
 
 
 	/* Check that the next state if we're stopping a killed job is
@@ -4203,7 +4241,7 @@
 	job->goal = JOB_STOP;
 	job->state = JOB_KILLED;
 
-	TEST_EQ (job_next_state (job), JOB_POST_STOP);
+	TEST_EQ (job_next_state (job), JOB_POST_STOP_SETUP);
 
 
 	/* Check that the next state if we're starting a post-stop job is
 
=== modified file 'scripts/Makefile.am'
--- scripts/Makefile.am	2013-11-14 11:42:05 +0000
+++ scripts/Makefile.am	2014-04-08 20:51:56 +0000
@@ -12,24 +12,24 @@
 	upstart-monitor.py
 
 noinst_SCRIPTS = \
-	pyupstart.py
+	pyupstart.py \
+	pyupstartvars.py
 
 CLEANFILES = \
-	pyupstart.py
+	pyupstartvars.py pyupstartvars.py.tmp
 
 EXTRA_DIST = \
 	$(install_scripts) \
-	pyupstart.py.in \
+	pyupstart.py \
 	tests/__init__.py \
 	tests/test_pyupstart_session_init.py \
 	tests/test_pyupstart_system_init.py
 
-pyupstart.py: pyupstart.py.in Makefile
-	sed -e 's|[@]built_init_binary[@]|$(UPSTART_BINARY)|g' \
-	    -e 's|[@]built_initctl_binary[@]|$(INITCTL_BINARY)|g' \
-	    -e 's|[@]built_file_bridge_binary[@]|$(FILE_BRIDGE_BINARY)|g' \
-	    $< > $@
-	chmod +x $@
+pyupstartvars.py: Makefile
+	echo "BUILT_UPSTART = '$(UPSTART_BINARY)'" > pyupstartvars.py.tmp
+	echo "BUILT_INITCTL = '$(INITCTL_BINARY)'" >> pyupstartvars.py.tmp
+	echo "BUILT_FILE_BRIDGE = '$(FILE_BRIDGE_BINARY)'" >> pyupstartvars.py.tmp
+	mv pyupstartvars.py.tmp pyupstartvars.py
 
 dist_man_MANS = \
   man/initctl2dot.8 \
 
=== renamed file 'scripts/pyupstart.py.in' => 'scripts/pyupstart.py'
--- scripts/pyupstart.py.in	2014-03-05 10:41:18 +0000
+++ scripts/pyupstart.py	2014-04-08 20:51:56 +0000
@@ -20,6 +20,8 @@
 import pyinotify
 import subprocess
 import shutil
+import sys
+import unittest
 import dbus
 import dbus.service
 import dbus.mainloop.glib
@@ -28,6 +30,11 @@
 from datetime import datetime, timedelta
 from gi.repository import GLib
 
+try:
+    from pyupstartvars import *
+except:
+    pass
+
 VERSION = '0.1'
 NAME = 'TestUpstart'
 
@@ -36,10 +43,6 @@
 SYSTEM_INITCTL = '/sbin/initctl'
 SYSTEM_FILE_BRIDGE = '/sbin/upstart-file-bridge'
 
-BUILT_UPSTART = '@built_init_binary@'
-BUILT_INITCTL = '@built_initctl_binary@'
-BUILT_FILE_BRIDGE = '@built_file_bridge_binary@'
-
 UPSTART_SESSION_ENV = 'UPSTART_SESSION'
 USE_SYSTEM_BINARIES_ENV = 'UPSTART_TEST_USE_SYSTEM_BINARIES'
 
@@ -64,6 +67,10 @@
 OBJECT_PATH              = '/com/ubuntu/Upstart'
 FREEDESKTOP_PROPERTIES   = 'org.freedesktop.DBus.Properties'
 
+CGM_SOCKET = 'unix:path=/sys/fs/cgroup/cgmanager/sock'
+CGM_INTERFACE_NAME = 'org.linuxcontainers.cgmanager0_0'
+CGM_OBJECT_PATH = '/org/linuxcontainers/cgmanager'
+
 # Maximum number of seconds to wait for Upstart to detect a new job
 # has been created
 JOB_WAIT_SECS = 5
@@ -83,6 +90,7 @@
 
 #---------------------------------------------------------------------
 
+
 def get_init():
     """
     Return full path to an appropriate init daemon binary.
@@ -95,6 +103,7 @@
     assert (os.path.exists(binary))
     return binary
 
+
 def get_initctl():
     """
     Return full path to an appropriate initctl binary.
@@ -107,6 +116,7 @@
     assert (os.path.exists(binary))
     return binary
 
+
 def get_file_bridge():
     """
     Return full path to an appropriate upstart-file-bridge binary.
@@ -119,6 +129,7 @@
     assert (os.path.exists(binary))
     return binary
 
+
 def dbus_encode(str):
     """
     Simulate nih_dbus_path() which Upstart uses to convert
@@ -195,6 +206,13 @@
     pass
 
 
+class CGMException(Exception):
+    """
+    An Upstart Exception.
+    """
+    pass
+
+
 class Upstart:
     """
     Upstart Class.
@@ -972,6 +990,7 @@
             self.stop()
             self.logfile.destroy()
 
+
 class SystemInit(Upstart):
 
     def __init__(self):
@@ -991,6 +1010,59 @@
         os.system('telinit u')
 
 
+class CGManager():
+
+    def __init__(self, socket=CGM_SOCKET):
+        self.socket = socket
+        self.connection = None
+        self.remote_object = None
+        self.proxy = None
+        self.connect()
+        with open('/proc/cgroups') as f:
+            self.all_cgroups = [l.split('\t')[0] for l in
+                                f.readlines() if not l.startswith('#')]
+
+    def connect(self, force=False):
+        """
+        Connect to CGManager.
+
+        @force: if True, connect regardless of whether already
+        connected.
+
+        Notes:
+          - Raises an CGMException() if already connected.
+        """
+        if self.connection and not force:
+            raise CGMException('Already connected')
+
+        # Create appropriate D-Bus connection
+        self.connection = dbus.connection.Connection(self.socket)
+        self.remote_object = self.connection.get_object(
+            object_path=CGM_OBJECT_PATH)
+        self.proxy = dbus.Interface(self.remote_object, CGM_INTERFACE_NAME)
+        self.Ping(0)
+
+    def api_version(self):
+        """
+        Determine api-version of running CGManager.
+
+        Returns: API Version as a string.
+
+        """
+        properties = dbus.Interface(self.remote_object, FREEDESKTOP_PROPERTIES)
+        return int(properties.Get(CGM_INTERFACE_NAME, 'api_version'))
+
+    def setup_sandbox(self, sandbox, pid):
+        for controller in self.all_cgroups:
+            if sandbox:
+                self.Create(controller, sandbox)
+                self.RemoveOnEmpty(controller, sandbox)
+            self.MovePid(controller, sandbox, pid)
+
+    def __getattr__(self, name):
+        return getattr(self.proxy, name)
+
+
 class SessionInit(Upstart):
     """
     Create a new Upstart Session or join an existing one.
@@ -1164,3 +1236,29 @@
 
         self.logger.debug("Restarting Session Init")
         self.proxy.Restart()
+
+def main():
+    kwargs = {}
+    format =             \
+        '%(asctime)s:'   \
+        '%(filename)s:'  \
+        '%(name)s:'      \
+        '%(funcName)s:'  \
+        '%(levelname)s:' \
+        '%(message)s'
+
+    kwargs['format'] = format
+
+    # We want to see what's happening
+    kwargs['level'] = logging.DEBUG
+
+    logging.basicConfig(**kwargs)
+
+    unittest.main(
+        testRunner=unittest.TextTestRunner(
+            stream=sys.stdout,
+            verbosity=2
+        )
+    )
+
+    sys.exit(0)
 
=== added file 'scripts/tests/test_pyupstart_cgmanager.py'
--- scripts/tests/test_pyupstart_cgmanager.py	1970-01-01 00:00:00 +0000
+++ scripts/tests/test_pyupstart_cgmanager.py	2014-04-08 20:51:56 +0000
@@ -0,0 +1,63 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+#---------------------------------------------------------------------
+# Copyright © 2014 Canonical Ltd.
+#
+# Author: Dimitri John Ledkov <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# Description: unit-tests for the CGManager() object
+#
+#---------------------------------------------------------------------
+
+import os
+import sys
+import tempfile
+import unittest
+
+base_dir = os.path.abspath(os.path.dirname(__file__))
+module_dir = os.path.normpath(os.path.realpath(base_dir + os.sep + '..'))
+
+# top-level unpacked source directory
+top_srcdir = os.path.normpath(os.path.realpath(module_dir + os.sep + '..'))
+
+# Tell Python where the uninstalled module lives in the source tree
+sys.path.append(module_dir)
+from pyupstart import *
+
+class TestCGManager(unittest.TestCase):
+    def setUp(self):
+        self.cg = CGManager()
+        self.tempfile = tempfile.NamedTemporaryFile(prefix='TestCGManager')
+        self.tempname = os.path.split(self.tempfile.name)[-1]
+        
+    def test_init(self):
+        self.assertRaises(CGMException, self.cg.connect, ())
+
+    def test_api_version(self):
+        self.assertEqual(self.cg.api_version(), 2)
+
+    def test_setup_sandbox(self):
+        pid = os.getpid()
+        self.cg.setup_sandbox(self.tempname, pid)
+        with open('/proc/self/cgroup') as f:
+            missing = [l for l in f.readlines() if self.tempname not in l]
+        self.assertEqual(len(missing), 1)
+        self.assertTrue("name=systemd" in missing[0])        
+
+if __name__ == '__main__':
+    main()
 
=== modified file 'scripts/tests/test_pyupstart_session_init.py'
--- scripts/tests/test_pyupstart_session_init.py	2014-03-05 10:41:18 +0000
+++ scripts/tests/test_pyupstart_session_init.py	2014-04-08 20:51:56 +0000
@@ -539,31 +539,5 @@
         self.assertEqual(path, full_job_path)
         self.stop_session_init()
 
-def main():
-    kwargs = {}
-    format =             \
-        '%(asctime)s:'   \
-        '%(filename)s:'  \
-        '%(name)s:'      \
-        '%(funcName)s:'  \
-        '%(levelname)s:' \
-        '%(message)s'
-
-    kwargs['format'] = format
-
-    # We want to see what's happening
-    kwargs['level'] = logging.DEBUG
-
-    logging.basicConfig(**kwargs)
-
-    unittest.main(
-        testRunner=unittest.TextTestRunner(
-            stream=sys.stdout,
-            verbosity=2
-        )
-    )
-
-    sys.exit(0)
-
 if __name__ == '__main__':
     main()
 
=== added file 'scripts/tests/test_pyupstart_system_cgroups.py'
--- scripts/tests/test_pyupstart_system_cgroups.py	1970-01-01 00:00:00 +0000
+++ scripts/tests/test_pyupstart_system_cgroups.py	2014-04-08 20:51:56 +0000
@@ -0,0 +1,73 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+#---------------------------------------------------------------------
+# Copyright © 2014 Canonical Ltd.
+#
+# Author: Dimitri John Ledkov <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# Description: unit-tests for the CGManager() object
+#
+#---------------------------------------------------------------------
+
+import os
+import sys
+import tempfile
+import unittest
+
+base_dir = os.path.abspath(os.path.dirname(__file__))
+module_dir = os.path.normpath(os.path.realpath(base_dir + os.sep + '..'))
+
+# top-level unpacked source directory
+top_srcdir = os.path.normpath(os.path.realpath(module_dir + os.sep + '..'))
+
+# Tell Python where the uninstalled module lives in the source tree
+sys.path.append(module_dir)
+from pyupstart import *
+from tests.test_pyupstart_system_init import TestSystemUpstart
+
+class TestSystemCGManager(TestSystemUpstart):
+    def setUp(self):
+        self.cg = CGManager()
+        self.tempfile = tempfile.NamedTemporaryFile(prefix='TestSystemCGManager')
+        self.tempname = os.path.split(self.tempfile.name)[-1]
+        self.cg.setup_sandbox(self.tempname, 1)
+        self.sample_job = [ "cgroup {} {}".format(cgroup, self.tempname)
+                            for cgroup in self.cg.all_cgroups ]
+        self.sample_job.append('exec upstart-udev-bridge')        
+        super().setUp()
+
+    def test_main(self):
+        job = self.upstart.job_create('main', self.sample_job)
+        job.start(wait=True)
+        self._assert_all_match(job.pids()['main'])
+
+    def test_pre_start(self):
+        self.sample_job.append('pre-start exec cat /proc/self/cgroup')
+        job = self.upstart.job_create('pre-start', self.sample_job)
+        job.start()
+        print(job.logfile_name())
+        # Kaboom!
+        
+    def _assert_all_match(self, pid):
+        for c in self.cg.all_cgroups:
+            self.assertEqual(
+                self.cg.GetPidCgroup(c, pid),
+                self.tempname)
+
+if __name__ == '__main__':
+    main()
 
=== modified file 'scripts/tests/test_pyupstart_system_init.py'
--- scripts/tests/test_pyupstart_system_init.py	2014-03-10 13:43:50 +0000
+++ scripts/tests/test_pyupstart_system_init.py	2014-04-08 20:51:56 +0000
@@ -167,31 +167,6 @@
         self.upstart.polling_connect(force=True)
         self.assertTrue(self.upstart.version())
 
-def main():
-    kwargs = {}
-    format =             \
-        '%(asctime)s:'   \
-        '%(filename)s:'  \
-        '%(name)s:'      \
-        '%(funcName)s:'  \
-        '%(levelname)s:' \
-        '%(message)s'
-
-    kwargs['format'] = format
-
-    # We want to see what's happening
-    kwargs['level'] = logging.DEBUG
-
-    logging.basicConfig(**kwargs)
-
-    unittest.main(
-        testRunner=unittest.TextTestRunner(
-            stream=sys.stdout,
-            verbosity=2
-        )
-    )
-
-    sys.exit(0)
 
 if __name__ == '__main__':
     main()