Merge lp:~pitti/friends/fix-autopkgtest into lp:friends

[Martin Pitt]

* debian/tests/unit: Redirect stderr to stdout, as unittest discover writes
  to stderr by default. Succeeding autopkgtests must not write anything
  there.
* Run autopkgtests under xvfb, otherwise D-BUS autospawn fails.
* Add dbus-x11 test dependency, for D-BUS autospawning.

friends' autopgkgtests are failing for multiple reasons:
http://10.98.0.1:8080/view/Raring/view/AutoPkgTest/job/raring-adt-friends/

This branch fixes them all, so that this works now:

  run-adt-test -sS lp:~pitti/friends/fix-autopkgtest friends

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:164
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~pitti/friends/fix-autopkgtest/+merge/153749/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/friends-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-raring-amd64-ci/7/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/friends-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks great, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-11 10:43:36 +0000
+++ debian/changelog	2013-03-18 10:55:26 +0000
@@ -1,3 +1,13 @@
+friends (0.1.2daily13.03.11.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/tests/unit: Redirect stderr to stdout, as unittest discover writes
+    to stderr by default. Succeeding autopkgtests must not write anything
+    there.
+  * Run autopkgtests under xvfb, otherwise D-BUS autospawn fails.
+  * Add dbus-x11 test dependency, for D-BUS autospawning.
+
+ -- Martin Pitt <[e-mail]>  Mon, 18 Mar 2013 11:41:27 +0100
+
 friends (0.1.2daily13.03.11.1-0ubuntu1) raring; urgency=low
 
   [ Robert Bruce Park ]

=== modified file 'debian/tests/control'
--- debian/tests/control	2012-10-22 15:31:06 +0000
+++ debian/tests/control	2013-03-18 10:55:26 +0000
@@ -1,3 +1,3 @@
 Tests: unit
-Depends: @, python3, python3-distutils-extra, python3-pkg-resources, python3-setuptools, python3-gobject, python3-gi, python3-dbus, python3-mock, python3-oauthlib, gir1.2-dee-1.0, gir1.2-soup-2.4, gir1.2-glib-2.0, gir1.2-gdkpixbuf-2.0, gir1.2-signon-1.0, gir1.2-networkmanager-1.0, libaccounts-glib-dev, libsignon-glib1, shared-mime-info
+Depends: @, python3, python3-distutils-extra, python3-pkg-resources, python3-setuptools, python3-gobject, python3-gi, python3-dbus, python3-mock, python3-oauthlib, gir1.2-dee-1.0, gir1.2-soup-2.4, gir1.2-glib-2.0, gir1.2-gdkpixbuf-2.0, gir1.2-signon-1.0, gir1.2-networkmanager-1.0, libaccounts-glib-dev, libsignon-glib1, shared-mime-info, xvfb, dbus-x11
 

=== modified file 'debian/tests/unit'
--- debian/tests/unit	2012-10-22 13:21:40 +0000
+++ debian/tests/unit	2013-03-18 10:55:26 +0000
@@ -1,2 +1,3 @@
 #! /bin/sh
-make check
+# succeeding test must not write anything to stderr, as per DEP-8
+xvfb-run make check 2>&1