[Python-modules-commits] r32165 - in packages/django-nose/trunk/debian/patches (runtests.patch)

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

    Date: Friday, April 3, 2015 @ 08:08:37
  Author: fladi-guest
Revision: 32165

Refresh runtests.patch.

Modified:
  packages/django-nose/trunk/debian/patches/runtests.patch

Modified: packages/django-nose/trunk/debian/patches/runtests.patch
===================================================================
--- packages/django-nose/trunk/debian/patches/runtests.patch	2015-04-03 08:08:01 UTC (rev 32164)
+++ packages/django-nose/trunk/debian/patches/runtests.patch	2015-04-03 08:08:37 UTC (rev 32165)
@@ -8,31 +8,41 @@
 Last-Update: 2011-11-26
 Forwarded: no
 
-Index: django-nose/runtests.sh
-===================================================================
---- django-nose.orig/runtests.sh	2013-07-24 03:23:04.000000000 +1000
-+++ django-nose/runtests.sh	2014-08-13 13:22:41.531346643 +1000
+--- a/runtests.sh
++++ b/runtests.sh
 @@ -1,6 +1,9 @@
- #!/bin/sh
+ #!/bin/bash
  
  export PYTHONPATH=.
 +if [ -z $PYTHON ]; then
 +    export PYTHON=python
 +fi
  
- django_test() {
-     TEST="$1"
-@@ -25,9 +28,7 @@
+ PYTHONVERSION=$(python --version 2>&1)
+ PYTHONVERSION=${PYTHONVERSION##Python }
+@@ -37,18 +40,18 @@
      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 "$PYTHON /usr/bin/django-admin test --settings=testapp.settings" '2' 'normal settings'
+ if [ "$DJANGO" = "Django==1.4.1" -o "$DJANGO" = "Django==1.5" -o "$DJANGO" = "Django==1.6" ]
+ then
+-    django_test 'django-admin.py test --settings=testapp.settings_with_south' '2' 'with south in installed apps'
++    django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings_with_south" '2' 'with south in installed apps'
+ fi
+ 
 -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 'django-admin.py test --settings=testapp.settings unittests' '4' 'unittests'
-+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_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'
++django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings unittests" '4' 'unittests'
+ if ! [ $(version $PYTHONVERSION) \> $(version 3.0.0) ]
+ then
+ # Python 3 doesn't support the hotshot profiler. See nose#842.
+-django_test 'django-admin.py test --settings=testapp.settings --with-profile' '2' 'with profile plugin'
++django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings --with-profile" '2' 'with profile plugin'
+ fi