[Python-modules-commits] r23550 - in packages/pyxdg/trunk/debian (rules tests/upstream)

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

    Date: Friday, February 22, 2013 @ 11:43:51
  Author: takluyver-guest
Revision: 23550

Don't use nosetests-x.y scripts for tests

Modified:
  packages/pyxdg/trunk/debian/rules
  packages/pyxdg/trunk/debian/tests/upstream

Modified: packages/pyxdg/trunk/debian/rules
===================================================================
--- packages/pyxdg/trunk/debian/rules	2013-02-22 08:06:55 UTC (rev 23549)
+++ packages/pyxdg/trunk/debian/rules	2013-02-22 11:43:51 UTC (rev 23550)
@@ -9,10 +9,13 @@
 	dh $@ --with python2,python3
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-test-python%:
-	nosetests-$* -v
+test-python2%:
+	python$* /usr/bin/nosetests -v
 
-override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+test-python3%:
+	python$* /usr/bin/nosetests3 -v
+
+override_dh_auto_test: $(PYTHON2:%=test-python2%) $(PYTHON3:%=test-python3%)
 endif
 
 build-python%:

Modified: packages/pyxdg/trunk/debian/tests/upstream
===================================================================
--- packages/pyxdg/trunk/debian/tests/upstream	2013-02-22 08:06:55 UTC (rev 23549)
+++ packages/pyxdg/trunk/debian/tests/upstream	2013-02-22 11:43:51 UTC (rev 23550)
@@ -2,10 +2,15 @@
 
 set -e
 
-PYTHONS="`pyversions -vd` `py3versions -vd`"
+PYTHON2S=`pyversions -d`
+PYTHON3S=`py3versions -d`
 
 cd test
 
-for PY in $PYTHONS; do
-    nosetests-$PY -v 2>&1;
+for PY in $PYTHON2S; do
+    $PY /usr/bin/nosetests -v 2>&1;
 done
+
+for PY in $PYTHON3S; do
+    $PY /usr/bin/nosetests3 -v 2>&1;
+done