[Python-modules-commits] [cherrypy3] 06/08: merge patched into master

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository cherrypy3.

commit 8f81c9e6ed4887cc2d8ac3ad7380541b308f977e
Merge: 15d7d65 80acc33
Author: Carl Suster <carl at contraflo.ws>
Date:   Fri Jan 6 19:47:21 2017 +1100

    merge patched into master

 cherrypy/test/static/index.html                    |  2 +-
 cherrypy/test/test_caching.py                      |  2 +-
 cherrypy/tutorial/tutorial.conf                    |  8 +++---
 debian/.git-dpm                                    |  4 +--
 .../patches/0003-disable-test_antistampede.patch   | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 6 files changed, 40 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index ee3125f,0000000..c04576d
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
- 881b9078e3c3724d1565a22750402bf586759084
- 881b9078e3c3724d1565a22750402bf586759084
++80acc3353981e75c784c5b017da6b35355d33643
++80acc3353981e75c784c5b017da6b35355d33643
 +19b5509b39bed64544a4d901e6751e90a6da93a7
 +19b5509b39bed64544a4d901e6751e90a6da93a7
 +cherrypy3_8.7.0.orig.tar.gz
 +6a55e351e68edc3ccf1a5d2d99117c400d13ea6f
 +712835
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-disable-test_antistampede.patch
index 0000000,0000000..089c1be
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-disable-test_antistampede.patch
@@@ -1,0 -1,0 +1,31 @@@
++From 80acc3353981e75c784c5b017da6b35355d33643 Mon Sep 17 00:00:00 2001
++From: Carl Suster <carl at contraflo.ws>
++Date: Fri, 6 Jan 2017 19:44:00 +1100
++Subject: disable test_antistampede
++
++This test spawns many threads that all make a request to an endpoint in
++the web server which does nothing but sleep and return a string. The
++idea is that if caching works this is very fast, so the test assertion
++is that the test was completed quickly.
++
++If the test fails it could run for quite a while, and there is a known
++problem upstream which makes this test unreliable which is why it is
++marked as allowed to fail for pytest. To speed things up, we disable it
++completely until it works more reliably.
++---
++ cherrypy/test/test_caching.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/cherrypy/test/test_caching.py b/cherrypy/test/test_caching.py
++index fa2b8cb..1e95341 100644
++--- a/cherrypy/test/test_caching.py
+++++ b/cherrypy/test/test_caching.py
++@@ -292,7 +292,7 @@ class CacheTest(helper.CPWebCase):
++             self.assertHeader('Age')
++ 
++     @pytest.mark.xfail(reason='#1536')
++-    def test_antistampede(self):
+++    def disabled_test_antistampede(self):
++         SECONDS = 4
++         slow_url = '/long_process?seconds={SECONDS}'.format(**locals())
++         # We MUST make an initial synchronous request in order to create the
diff --cc debian/patches/series
index 154c505,0000000..6051cf7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-disable-sphinx-rst.linker-extension.patch
 +0002-use-mock.mock-instead-of-unittest.mock.patch
++0003-disable-test_antistampede.patch

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