[Python-modules-commits] r19436 - in packages/django-nose/trunk/debian (6 files)

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

    Date: Saturday, November 26, 2011 @ 08:59:51
  Author: fladi-guest
Revision: 19436

Use upstream test runner.

Added:
  packages/django-nose/trunk/debian/patches/
  packages/django-nose/trunk/debian/patches/runtests.patch
  packages/django-nose/trunk/debian/patches/series
Modified:
  packages/django-nose/trunk/debian/changelog
  packages/django-nose/trunk/debian/control
  packages/django-nose/trunk/debian/rules

Modified: packages/django-nose/trunk/debian/changelog
===================================================================
--- packages/django-nose/trunk/debian/changelog	2011-11-25 20:51:47 UTC (rev 19435)
+++ packages/django-nose/trunk/debian/changelog	2011-11-26 08:59:51 UTC (rev 19436)
@@ -6,8 +6,13 @@
   * Bump python-django dependency to (>= 1.2).
   * Temporary fix for Metadata-Version in PKG-INFO (see #645125).
   * Use http://githubredir.debian.net in d/watch to get clean tarball.
+  * Use runtests.sh provided by upstream to run all tests.
+  * Add python-django-south to Build-Depends to be able to run all
+    tests.
+  * Add patch for runtests.sh to enable the use of non-default python
+    versions for running the tests.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Fri, 18 Nov 2011 09:01:54 +0100
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Sat, 26 Nov 2011 09:51:39 +0100
 
 django-nose (0.1.2-2) unstable; urgency=low
 

Modified: packages/django-nose/trunk/debian/control
===================================================================
--- packages/django-nose/trunk/debian/control	2011-11-25 20:51:47 UTC (rev 19435)
+++ packages/django-nose/trunk/debian/control	2011-11-26 08:59:51 UTC (rev 19436)
@@ -6,6 +6,7 @@
 Build-Depends: debhelper (>= 7.0.50~),
                python-all (>= 2.5),
                python-django (>= 1.2),
+               python-django-south,
                python-nose,
                python-setuptools,
                python-support

Added: packages/django-nose/trunk/debian/patches/runtests.patch
===================================================================
--- packages/django-nose/trunk/debian/patches/runtests.patch	                        (rev 0)
+++ packages/django-nose/trunk/debian/patches/runtests.patch	2011-11-26 08:59:51 UTC (rev 19436)
@@ -0,0 +1,36 @@
+Description: Enable non-default python versions for test runs
+ The original version of runtests.sh only allows to run the tests on the current 
+ default python version. This patch add the environment variable PYTHON that can 
+ be set to a specific python binary (e.g. python2.6) to run the tests with.
+ It also changes the path for django-admin.py to the one supplied by the 
+ python-django package.
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Last-Update: 2011-11-26
+Forwarded: no
+
+--- a/runtests.sh
++++ b/runtests.sh
+@@ -1,6 +1,9 @@
+ #!/bin/sh
+ 
+ export PYTHONPATH=.
++if [ -z $PYTHON ]; then
++    export PYTHON=python
++fi
+ 
+ django_test() {
+     TEST="$1"
+@@ -25,8 +28,8 @@
+     fi
+ }
+ 
+-django_test 'django-admin.py test --settings=testapp.settings' '2' 'normal settings'
+-django_test 'django-admin.py test --settings=testapp.settings_with_south' '2' 'with south in installed apps'
+-django_test 'django-admin.py test --settings=testapp.settings_old_style' '2' 'django_nose.run_tests format'
+-django_test 'testapp/runtests.py testapp.test_only_this' '1' 'via run_tests API'
+-django_test 'django-admin.py test --settings=testapp.settings_with_plugins testapp/plugin_t' '1' 'with plugins'
++django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings" '2' 'normal settings'
++django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings_with_south" '2' 'with south in installed apps'
++django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings_old_style" '2' 'django_nose.run_tests format'
++django_test "$PYTHON testapp/runtests.py testapp.test_only_this" '1' 'via run_tests API'
++django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings_with_plugins testapp/plugin_t" '1' 'with plugins'

Added: packages/django-nose/trunk/debian/patches/series
===================================================================
--- packages/django-nose/trunk/debian/patches/series	                        (rev 0)
+++ packages/django-nose/trunk/debian/patches/series	2011-11-26 08:59:51 UTC (rev 19436)
@@ -0,0 +1 @@
+runtests.patch

Modified: packages/django-nose/trunk/debian/rules
===================================================================
--- packages/django-nose/trunk/debian/rules	2011-11-25 20:51:47 UTC (rev 19435)
+++ packages/django-nose/trunk/debian/rules	2011-11-26 08:59:51 UTC (rev 19436)
@@ -12,7 +12,7 @@
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e; \
 	for python in $(shell pyversions -r); do \
-	  $$python /usr/bin/django-admin test --settings=testapp.settings --pythonpath=. ; \
+	  PYTHON=$$python ./runtests.sh; \
 	done
 endif