[Python-modules-commits] [django-nose] 07/14: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to annotated tag debian/1.4.2-1
in repository django-nose.

commit 662f34e63fbac734e82422bbcdfb57f88240feb0
Merge: b5c59b5 6485660
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Oct 16 12:22:57 2015 +0200

    merge patched into master

 debian/.git-dpm               |  4 ++--
 debian/patches/runtests.patch | 14 ++++++++------
 runtests.sh                   |  2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 11508bf,0000000..f8d8d58
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- a232fa63e8e4d6763013e29674abd087cd297908
- a232fa63e8e4d6763013e29674abd087cd297908
++6485660bd36b36aa6c0b57dda7dc41d3b39d6176
++6485660bd36b36aa6c0b57dda7dc41d3b39d6176
 +4ee0cc56a19788fb299a20d2f63e361a7caf0927
 +4ee0cc56a19788fb299a20d2f63e361a7caf0927
 +django-nose_1.4.2.orig.tar.gz
 +37c3131913e6be9f4cbfeebbc86a563b1f3955bf
 +41800
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/runtests.patch
index aaae670,0000000..c1f20f0
mode 100644,000000..100644
--- a/debian/patches/runtests.patch
+++ b/debian/patches/runtests.patch
@@@ -1,88 -1,0 +1,90 @@@
- From a232fa63e8e4d6763013e29674abd087cd297908 Mon Sep 17 00:00:00 2001
++From 6485660bd36b36aa6c0b57dda7dc41d3b39d6176 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 08:54:28 -0700
 +Subject: 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.
 +Last-Update: 2011-11-26
 +Forwarded: no
 +
 +Patch-Name: runtests.patch
 +---
-  runtests.sh | 25 ++++++++++++++-----------
-  1 file changed, 14 insertions(+), 11 deletions(-)
++ runtests.sh | 27 ++++++++++++++++-----------
++ 1 file changed, 16 insertions(+), 11 deletions(-)
 +
 +diff --git a/runtests.sh b/runtests.sh
- index 38a01f0..1ac7b46 100755
++index 38a01f0..e4d6338 100755
 +--- a/runtests.sh
 ++++ b/runtests.sh
- @@ -36,6 +36,9 @@ then
++@@ -36,6 +36,11 @@ then
 + fi
 + 
 + export PYTHONPATH=.
 ++if [ -z $PYTHON ]; then
 ++    export PYTHON=python
 ++fi
+++
+++export DJANGO_SETTINGS_MODULE=testapp.settings
 + 
 + HAS_HOTSHOT=$(python -c "\
 + try:
- @@ -147,44 +150,44 @@ django_test() {
++@@ -147,44 +152,44 @@ django_test() {
 + TESTAPP_COUNT=6
 + 
 + reset_env
 +-django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'normal settings'
 ++django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'normal settings'
 + 
 +-DJANGO_VERSION=`./manage.py version | cut -d. -f1-2`
 ++DJANGO_VERSION=`$PYTHON /usr/bin/django-admin version | cut -d. -f1-2`
 + if [ "$DJANGO_VERSION" = "1.4" -o "$DJANGO_VERSION" = "1.5" -o "$DJANGO_VERSION" = "1.6" ]
 + then
 +     reset_env
 +     export USE_SOUTH=1
 +-    django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'with south in installed apps'
 ++    django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'with south in installed apps'
 + fi
 + 
 + reset_env
 + export TEST_RUNNER="django_nose.run_tests"
 +-django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'django_nose.run_tests format'
 ++django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'django_nose.run_tests format'
 + 
 + reset_env
 +-django_test "testapp/runtests.py testapp.test_only_this" 1 'via run_tests API'
 ++django_test "$PYTHON testapp/runtests.py testapp.test_only_this" 1 'via run_tests API'
 + 
 + reset_env
 + export NOSE_PLUGINS="testapp.plugins.SanityCheckPlugin"
 +-django_test "./manage.py test testapp/plugin_t $NOINPUT" 1 'with plugins'
 ++django_test "$PYTHON /usr/bin/django-admin test testapp/plugin_t $NOINPUT" 1 'with plugins'
 + 
 + reset_env
 +-django_test "./manage.py test unittests $NOINPUT" 4 'unittests'
 ++django_test "$PYTHON /usr/bin/django-admin test unittests $NOINPUT" 4 'unittests'
 + 
 + reset_env
 +-django_test "./manage.py test unittests --testrunner=testapp.custom_runner.CustomNoseTestSuiteRunner $NOINPUT" 4 'unittests with testrunner'
 ++django_test "$PYTHON /usr/bin/django-admin test unittests --testrunner=testapp.custom_runner.CustomNoseTestSuiteRunner $NOINPUT" 4 'unittests with testrunner'
 + 
 + reset_env
 + export REUSE_DB=1
 + # For the many issues with REUSE_DB=1, see:
 + # https://github.com/django-nose/django-nose/milestones/Fix%20REUSE_DB=1
 +-django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #1' 'can fail'
 +-django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #2' 'can fail'
 ++django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #1' 'can fail'
 ++django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #2' 'can fail'
 + 
 + 
 + if [ "$HAS_HOTSHOT" = "1" ]
 + then
 +     # Python 3 doesn't support the hotshot profiler. See nose#842.
 +     reset_env
 +-    django_test "./manage.py test $NOINPUT --with-profile --profile-restrict less_output" $TESTAPP_COUNT 'with profile plugin'
 ++    django_test "$PYTHON /usr/bin/django-admin test $NOINPUT --with-profile --profile-restrict less_output" $TESTAPP_COUNT 'with profile plugin'
 + fi

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