[Python-modules-commits] r21737 - in packages/python-notify2/trunk/debian (control rules)

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

    Date: Monday, May 14, 2012 @ 01:24:01
  Author: takluyver-guest
Revision: 21737

Tweaks for running tests during build.

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

Modified: packages/python-notify2/trunk/debian/control
===================================================================
--- packages/python-notify2/trunk/debian/control	2012-05-13 22:46:25 UTC (rev 21736)
+++ packages/python-notify2/trunk/debian/control	2012-05-14 01:24:01 UTC (rev 21737)
@@ -5,9 +5,16 @@
 Uploaders: Thomas Kluyver <thomas at kluyver.me.uk>
 Build-Depends: debhelper (>= 8),
                python3-all,
+               python3-dbus,
                python-all,
+               python-dbus,
+               dbus,
+               dbus-x11,
                notification-daemon,
-               xvfb
+               xvfb,
+               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-13 22:46:25 UTC (rev 21736)
+++ packages/python-notify2/trunk/debian/rules	2012-05-14 01:24:01 UTC (rev 21737)
@@ -4,15 +4,25 @@
 
 PYTHON2=$(shell pyversions -vr)
 PYTHON3=$(shell py3versions -vr)
+DISPLAY=:99
+DISPLAYENV=DISPLAY=$(DISPLAY)
 
 %:
 	dh $@ --with python2,python3
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-env:
+	# Set up X server and notification daemon
+	Xvfb $(DISPLAY) -ac &
+	sleep 1
+	$(DISPLAYENV) /usr/lib/notification-daemon/notification-daemon &
+	sleep 2
+
 test-python%:
-	xvfb-run python$* test_notify2.py
+	$(DISPLAYENV) python$* test_notify2.py
 
-override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+override_dh_auto_test: test-env $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+	killall Xvfb
 endif
 
 build-python%: