[Python-modules-commits] [django-nose] 09/10: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository django-nose.

commit f6e1bbb7e5c0539b8e5086bb783507abd5490061
Merge: 34ab7c4 88a35ce
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Jan 7 13:03:34 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...ts-that-use-REUSE_DB-as-they-are-currentl.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 runtests.sh                                        |  8 +++---
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index c3b1c14,0000000..e4849eb
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
- a0f484fe26b8df32f8a5b26a961dcc88340b1cd5
- a0f484fe26b8df32f8a5b26a961dcc88340b1cd5
++88a35ce342a64286a8ddf13ae428b2a4e9c5be67
++88a35ce342a64286a8ddf13ae428b2a4e9c5be67
 +d418be775674518b1226ef5039f7f36ec4b8d84d
 +d418be775674518b1226ef5039f7f36ec4b8d84d
 +django-nose_1.4.3.orig.tar.gz
 +2aaf28915cac4d52b8c1ceb586f3b7a09e278480
 +42647
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Disable-tests-that-use-REUSE_DB-as-they-are-currentl.patch
index 0000000,0000000..45778a3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Disable-tests-that-use-REUSE_DB-as-they-are-currentl.patch
@@@ -1,0 -1,0 +1,31 @@@
++From 88a35ce342a64286a8ddf13ae428b2a4e9c5be67 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 7 Jan 2016 13:02:24 +0100
++Subject: Disable tests that use REUSE_DB as they are currently broken.
++
++Bug-Vendor: https://github.com/django-nose/django-nose/milestones/Fix%20REUSE_DB=1
++---
++ runtests.sh | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/runtests.sh b/runtests.sh
++index e66c055..0b680b7 100755
++--- a/runtests.sh
+++++ b/runtests.sh
++@@ -185,12 +185,12 @@ django_test "$PYTHON /usr/bin/django-admin test unittests --testrunner=testapp.c
++ reset_env
++ django_test "$PYTHON /usr/bin/django-admin test unittests --attr special $NOINPUT" 1 'select by attribute'
++ 
++-reset_env
++-export REUSE_DB=1
+++#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 "$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'
+++#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" ]
diff --cc debian/patches/series
index 0b91c13,0000000..737185b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +django17.patch
 +runtests.patch
 +0003-Remove-unnecessary-dependency-on-dj_database_url.patch
++0004-Disable-tests-that-use-REUSE_DB-as-they-are-currentl.patch

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