[Python-modules-commits] [pydbus] 01/01: Revert to using our own run_tests.sh script as upstream's uses deprecated dbus-launch

[Alberto Caso]

This is an automated email from the git hooks/post-receive script.

acaso-guest pushed a commit to branch master
in repository pydbus.

commit 3a8208995fefb51b5e9189fdd7033cca9f6dd86e
Author: Alberto Caso <alberto.caso at juntaex.es>
Date:   Wed Jan 11 12:04:12 2017 +0100

    Revert to using our own run_tests.sh script as upstream's uses deprecated dbus-launch
---
 debian/changelog          |  2 --
 debian/control            |  2 +-
 debian/rules              |  2 +-
 debian/tests/control      |  2 --
 debian/tests/python2      |  2 +-
 debian/tests/python3      |  2 +-
 debian/tests/run_tests.sh | 12 ++++++++++++
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0470158..29bf9ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ pydbus (0.6.0-1) unstable; urgency=low
   * Update copyright info to reflect upstream author's new name and email
     address.
   * Remove no longer necessary .pyremove files.
-  * Drop debian/run_tests.sh script in favor of upstream's new tests/run.sh.
-    Add dbus-x11 build dependency as run.sh uses dbus-launch.
   * Add autopkgtest tests.
   * Lower rst2html's report level when generating README.html to avoid 
     warnings on minor typo.
diff --git a/debian/control b/debian/control
index 37983ba..ae0f22e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
 Priority: extra
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Alberto Caso <alberto.caso at juntaex.es>
-Build-Depends: dbus-x11,
+Build-Depends: dbus,
                debhelper (>= 9),
                dh-python,
                python-all,
diff --git a/debian/rules b/debian/rules
index fe7e697..ad03e93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ export PYBUILD_NAME=pydbus
 
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
-	PYBUILD_TEST_ARGS="tests/run.sh {interpreter}" \
+	PYBUILD_TEST_ARGS="debian/tests/run_tests.sh {interpreter}" \
 	dh_auto_test
 
 override_dh_installdocs:
diff --git a/debian/tests/control b/debian/tests/control
index eb003a6..f852c0b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,2 @@
 Tests: python3 python2
-Depends: @,
- dbus-x11
 
diff --git a/debian/tests/python2 b/debian/tests/python2
index 5e7909d..f1c283d 100644
--- a/debian/tests/python2
+++ b/debian/tests/python2
@@ -3,5 +3,5 @@
 set -e
 
 for py in $(pyversions -i); do
-    tests/run.sh $py
+    debian/tests/run_tests.sh $py
 done
diff --git a/debian/tests/python3 b/debian/tests/python3
index 3a9c62b..44406de 100644
--- a/debian/tests/python3
+++ b/debian/tests/python3
@@ -3,5 +3,5 @@
 set -e
 
 for py in $(py3versions -i); do
-    tests/run.sh $py
+    debian/tests/run_tests.sh $py
 done
diff --git a/debian/tests/run_tests.sh b/debian/tests/run_tests.sh
new file mode 100755
index 0000000..cb2dc36
--- /dev/null
+++ b/debian/tests/run_tests.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+TESTS_DIR=tests
+
+PYTHON=${1:-python}
+
+dbus-run-session "$PYTHON" $TESTS_DIR/context.py
+dbus-run-session "$PYTHON" $TESTS_DIR/identifier.py
+dbus-run-session "$PYTHON" $TESTS_DIR/publish.py
+dbus-run-session "$PYTHON" $TESTS_DIR/publish_properties.py
+dbus-run-session "$PYTHON" $TESTS_DIR/publish_multiface.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pydbus.git