[Python-modules-commits] [drf-haystack] 12/17: 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 drf-haystack.

commit bb7f9168a23434dcb2d011174223a8367b9e082f
Merge: c980eb8 818ff5c
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Jan 2 17:38:53 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../patches/0002-Log-to-console-during-tests.patch | 42 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/settings.py                                  | 11 ++----
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --cc debian/.git-dpm
index 110d290,0000000..5c94d84
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 366db6e9e18ee0564badead81b0d40b5a6cfc5bb
- 366db6e9e18ee0564badead81b0d40b5a6cfc5bb
++818ff5c90ee6f8405652335e72b97a179712d433
++818ff5c90ee6f8405652335e72b97a179712d433
 +35215bc7a17f7fb475a8cc7b0975aaa106c7e5db
 +35215bc7a17f7fb475a8cc7b0975aaa106c7e5db
 +drf-haystack_1.5.6.orig.tar.gz
 +c78b75af307dd3ab56c0e5c378696901038c6df6
 +52734
diff --cc debian/patches/0002-Log-to-console-during-tests.patch
index 0000000,0000000..7164f01
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Log-to-console-during-tests.patch
@@@ -1,0 -1,0 +1,42 @@@
++From 818ff5c90ee6f8405652335e72b97a179712d433 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Sat, 2 Jan 2016 17:38:39 +0100
++Subject: Log to console during tests.
++
++---
++ tests/settings.py | 11 +++--------
++ 1 file changed, 3 insertions(+), 8 deletions(-)
++
++diff --git a/tests/settings.py b/tests/settings.py
++index 24da78e..31d5954 100644
++--- a/tests/settings.py
+++++ b/tests/settings.py
++@@ -87,25 +87,20 @@ LOGGING = {
++             'class': 'logging.StreamHandler',
++             'formatter': 'standard'
++         },
++-        'file_handler': {
++-            'level': 'DEBUG',
++-            'class': 'logging.FileHandler',
++-            'filename': os.path.join(DEFAULT_LOG_DIR, 'tests.log'),
++-        },
++     },
++     'loggers': {
++         'default': {
++-            'handlers': ['file_handler'],
+++            'handlers': ['console_handler'],
++             'level': 'DEBUG',
++             'propagate': True,
++         },
++         'elasticsearch': {
++-            'handlers': ['file_handler'],
+++            'handlers': ['console_handler'],
++             'level': 'DEBUG',
++             'propagate': True,
++         },
++         'elasticsearch.trace': {
++-            'handlers': ['file_handler'],
+++            'handlers': ['console_handler'],
++             'level': 'DEBUG',
++             'propagate': True,
++         },
diff --cc debian/patches/series
index 1ea586b,0000000..f638db4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +python3-io.patch
++0002-Log-to-console-during-tests.patch

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