[Python-modules-commits] [paste] 02/02: merge patched into master

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository paste.

commit 96bb72a46d5affafca01f1e716487343a8e328f9
Merge: a47eaec 1877d96
Author: Ondřej Nový <novy at ondrej.org>
Date:   Thu Mar 10 21:39:45 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0002-Skip-test-with-network-access.patch       | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test_proxy.py                                |  4 +++
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 5bbed9e,0000000..0bb16aa
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
- fed2232ccb8d655a9c7dc8a9dcde80b66a5421bd
- fed2232ccb8d655a9c7dc8a9dcde80b66a5421bd
++1877d962479ad777cab5305b5813e8b186015758
++1877d962479ad777cab5305b5813e8b186015758
 +1c821a6f4b8f2e176228a8c4b055f98d94a56e70
 +1c821a6f4b8f2e176228a8c4b055f98d94a56e70
 +paste_2.0.3+dfsg.orig.tar.gz
 +63c4d0e4cd1b780da53a6a234d2df608fc6c6279
 +594469
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Skip-test-with-network-access.patch
index 0000000,0000000..3fc8953
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Skip-test-with-network-access.patch
@@@ -1,0 -1,0 +1,30 @@@
++From 1877d962479ad777cab5305b5813e8b186015758 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <novy at ondrej.org>
++Date: Thu, 10 Mar 2016 21:38:21 +0100
++Subject: Skip test with network access
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++Author: Ondřej Nový <novy at ondrej.org>
++Forwarded: no
++---
++ tests/test_proxy.py | 4 ++++
++ 1 file changed, 4 insertions(+)
++
++diff --git a/tests/test_proxy.py b/tests/test_proxy.py
++index 44db9f3..7486824 100644
++--- a/tests/test_proxy.py
+++++ b/tests/test_proxy.py
++@@ -1,7 +1,11 @@
++ from paste import proxy
++ from paste.fixture import TestApp
++ 
+++from nose.plugins.skip import Skip, SkipTest
+++
++ def test_paste_website():
+++    raise SkipTest # Prevent Debian FTBS, because this tests need network
+++
++     # Not the most robust test...
++     # need to test things like POSTing to pages, and getting from pages
++     # that don't set content-length.
diff --cc debian/patches/series
index c72fb60,0000000..c608798
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Use-correct-variable-when-building-message-for-excep.patch
++0002-Skip-test-with-network-access.patch

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