[Python-modules-commits] r21969 - in packages/python-notify2/trunk/debian (3 files)

[takluyver-guest at users.alioth.debian.org]

    Date: Monday, May 28, 2012 @ 13:10:17
  Author: takluyver-guest
Revision: 21969

Re-enable test suite with patch from jwilk

Modified:
  packages/python-notify2/trunk/debian/changelog
  packages/python-notify2/trunk/debian/control
  packages/python-notify2/trunk/debian/rules

Modified: packages/python-notify2/trunk/debian/changelog
===================================================================
--- packages/python-notify2/trunk/debian/changelog	2012-05-28 10:57:34 UTC (rev 21968)
+++ packages/python-notify2/trunk/debian/changelog	2012-05-28 13:10:17 UTC (rev 21969)
@@ -1,6 +1,6 @@
 python-notify2 (0.3-2) unstable; urgency=low
 
-  * Disable test suite, as autobuilders don't run dbus (Closes: #674351)
+  * Fix for running test suite, courtesy of Jakub Wilk (Closes: #674351)
 
  -- Thomas Kluyver <thomas at kluyver.me.uk>  Mon, 28 May 2012 11:06:00 +0100
 

Modified: packages/python-notify2/trunk/debian/control
===================================================================
--- packages/python-notify2/trunk/debian/control	2012-05-28 10:57:34 UTC (rev 21968)
+++ packages/python-notify2/trunk/debian/control	2012-05-28 13:10:17 UTC (rev 21969)
@@ -7,7 +7,15 @@
                python3-all,
                python3-dbus,
                python-all,
-               python-dbus
+               python-dbus,
+               dbus,
+               dbus-x11,
+               notification-daemon,
+               xvfb,
+               xauth,
+               python-gi,
+               python3-gi,
+               gir1.2-gdkpixbuf-2.0
 Standards-Version: 3.9.3
 Homepage: http://pypi.python.org/pypi/notify2
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-notify2/trunk/

Modified: packages/python-notify2/trunk/debian/rules
===================================================================
--- packages/python-notify2/trunk/debian/rules	2012-05-28 10:57:34 UTC (rev 21968)
+++ packages/python-notify2/trunk/debian/rules	2012-05-28 13:10:17 UTC (rev 21969)
@@ -2,6 +2,9 @@
 # -*- makefile -*-
 #DH_VERBOSE=1
 
+# This is needed on buildd so that dbus can use ~/.dbus
+export HOME = $(CURDIR)
+
 PYTHON2=$(shell pyversions -vr)
 PYTHON3=$(shell py3versions -vr)
 
@@ -10,12 +13,7 @@
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	# The test suite fails on the buildd, because the policy prevents the dbus
-	# daemon from starting, so I've disabled it for now. If you enable it,
-	# remember that it the test suite needs a number of extra build-dependencies:
-	#   dbus, dbus-x11, notification-daemon, xvfb, xauth, python-gi, python3-gi,
-	#   gir1.2-gdkpixbuf-2.0
-	#PYTHONS="$(PYTHON2) $(PYTHON3)" xvfb-run -a debian/runtests.sh
+	PYTHONS="$(PYTHON2) $(PYTHON3)" xvfb-run -a debian/runtests.sh
 endif
 
 build-python%:
@@ -34,3 +32,4 @@
 	dh_auto_clean
 	rm -rf build
 	rm -rf *.egg-info
+	rm -rf .dbus