Merge lp:~xnox/ubuntu/raring/upstart/autopkgtest-cleanedup into lp:ubuntu/raring/upstart

[Dimitri John Ledkov]

This adds autopkgtest suite.
Runs unit-tests, user-session tests.
While the initctl2dot test is added, it's not enabled as python3 port is not included in 1.6.1.

[lp:~xnox/ubuntu/raring/upstart/autopkgtest-cleanedup]

1408. By Dimitri John Ledkov on 2012-12-10

merge lp:ubuntu/upstart

[James Hunt (jamesodhunt)]

I'll merge this with very minor tweaks:

- drop debian/tests/run_initctl2dot for now as discussed since:

  a) the version in upstart 1.6.1 doesn't include the fix for bug 1058029.
  b) cherry-picking in the fix for bug 1058029 from lp:upstart would necessitate making upstart depend on python3, or having us modify the lp:upstart version to change the shebang to reference python2.7.

- I'll take my version of debian/tests/user_sessions since it uses 'sh -e' so we get a test failure even if modifying the dbus configuration occurs.

review: Approve

=== added file 'dbus/Upstart.conf.upstream'
--- dbus/Upstart.conf.upstream	1970-01-01 00:00:00 +0000
+++ dbus/Upstart.conf.upstream	2012-12-10 09:23:21 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE busconfig PUBLIC
+  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+  <!-- Only the root user can own the Upstart name -->
+  <policy user="root">
+    <allow own="com.ubuntu.Upstart" />
+  </policy>
+
+  <!-- Allow any user to invoke all of the methods on Upstart, its jobs
+       or their instances, and to get and set properties - since Upstart
+       isolates commands by user. -->
+  <policy context="default">
+    <allow send_destination="com.ubuntu.Upstart"
+	   send_interface="org.freedesktop.DBus.Introspectable" />
+    <allow send_destination="com.ubuntu.Upstart"
+	   send_interface="org.freedesktop.DBus.Properties" />
+    <allow send_destination="com.ubuntu.Upstart"
+	   send_interface="com.ubuntu.Upstart0_6" />
+    <allow send_destination="com.ubuntu.Upstart"
+	   send_interface="com.ubuntu.Upstart0_6.Job" />
+    <allow send_destination="com.ubuntu.Upstart"
+	   send_interface="com.ubuntu.Upstart0_6.Instance" />
+  </policy>
+</busconfig>

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-04 23:14:53 +0000
+++ debian/changelog	2012-12-10 09:23:21 +0000
@@ -17,6 +17,9 @@
     This prevents the output of running-in-container from being appended to
     rsyslog's upstart log (and any other job calling apparmor-profile-load).
 
+  [ Dmitrijs Ledkovs, James Hunt ]
+  * Add autopkgtests.
+
  -- Steve Langasek <[e-mail]>  Thu, 15 Nov 2012 09:26:10 -0800
 
 upstart (1.5-0ubuntu9) quantal-proposed; urgency=low

=== modified file 'debian/control'
--- debian/control	2012-11-15 19:54:44 +0000
+++ debian/control	2012-12-10 09:23:21 +0000
@@ -6,6 +6,7 @@
 Standards-Version: 3.8.4.0
 Build-Depends: debhelper (>= 9), pkg-config (>= 0.22), libnih-dev (>= 1.0.3), libnih-dbus-dev (>= 1.0.3), nih-dbus-tool (>= 1.0.3), libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), libudev-dev (>= 151-5), libjson0-dev, dbus, bash-completion
 Homepage: http://upstart.ubuntu.com/
+XS-Testsuite: autopkgtest
 
 Package: upstart
 Architecture: any

=== modified file 'debian/rules'
--- debian/rules	2012-11-18 05:18:50 +0000
+++ debian/rules	2012-12-10 09:23:21 +0000
@@ -20,6 +20,15 @@
 override_dh_auto_configure:
 	dh_auto_configure -- --exec-prefix=
 
+override_dh_auto_test:
+ifeq (0,$(shell id -u))
+	# WARNING: RUNNING TESTS AS ROOT IS KNOWN TO FAIL
+	# WARNING: WILL RUN TESTS, BUT WILL IGNORE FAILURE
+	-dh_auto_test
+else
+	dh_auto_test
+endif
+
 override_dh_fixperms:
 	dh_fixperms
 	chmod 755 debian/upstart/lib/init/upstart-job

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2012-12-10 09:23:21 +0000
@@ -0,0 +1,3 @@
+Tests: user_sessions
+Depends: @, dbus
+Restrictions: needs-root build-needed

=== added file 'debian/tests/run_initctl2dot'
--- debian/tests/run_initctl2dot	1970-01-01 00:00:00 +0000
+++ debian/tests/run_initctl2dot	2012-12-10 09:23:21 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+#---------------------------------------------------------------------
+# Attempt to generate an image of the available jobs on the system.
+#---------------------------------------------------------------------
+# Depends: graphviz
+
+. $(dirname $0)/test_setup
+
+outfile=upstart.png
+
+#------------------------------
+# Init
+
+initctl2dot -o - | dot -Tpng -o $ADTTMP/$outfile
+

=== added file 'debian/tests/test_setup'
--- debian/tests/test_setup	1970-01-01 00:00:00 +0000
+++ debian/tests/test_setup	2012-12-10 09:23:21 +0000
@@ -0,0 +1,25 @@
+#---------------------------------------------------------------------
+# Source this file in all tests
+#---------------------------------------------------------------------
+
+# user provided by auto-package-testing environment
+user=ubuntu
+
+#------------------------------
+# Assertions
+
+# We must be running as root initially to perform setup
+test $(id -u) -eq 0 || { echo "ERROR: not root"; exit 1; }
+
+# User must exist
+getent passwd $user >/dev/null 2>&1 || \
+	{ echo "ERROR: no user '$user'"; exit 1; }
+
+#------------------------------
+# Init
+
+# we need to run as root, but that means all unpacked files are owned by
+# root too.
+chown -R ${user}: . ..
+
+#---------------------------------------------------------------------

=== added file 'debian/tests/user_sessions'
--- debian/tests/user_sessions	1970-01-01 00:00:00 +0000
+++ debian/tests/user_sessions	2012-12-10 09:23:21 +0000
@@ -0,0 +1,33 @@
+#!/bin/sh
+#---------------------------------------------------------------------
+# Run Upstart User Session tests in DEP-8 environment.
+#---------------------------------------------------------------------
+
+. $(dirname $0)/test_setup
+
+#------------------------------
+# Init
+
+# Backup original config
+cp /etc/dbus-1/system.d/Upstart.conf \
+   /etc/dbus-1/system.d/Upstart.conf.ORIG
+
+# Enable user jobs (takes effect immediately)
+cp dbus/Upstart.conf.upstream \
+   /etc/dbus-1/system.d/Upstart.conf
+
+#------------------------------
+# test!
+
+su -c 'sh util/tests/test_user_sessions.sh' $user
+RET=$?
+
+#------------------------------
+# clean up
+
+# disable user jobs by reverting to original config
+cp /etc/dbus-1/system.d/Upstart.conf.ORIG \
+   /etc/dbus-1/system.d/Upstart.conf
+
+#------------------------------
+exit $RET