[Python-modules-commits] r29973 - in packages/python-dugong/trunk/debian (4 files)

[nikratio-guest at users.alioth.debian.org]

    Date: Monday, July 28, 2014 @ 00:14:35
  Author: nikratio-guest
Revision: 29973

* New upstream release.
* Dropped patches, included upstream:
  - disable_mock_server_logging.diff
  - fix_test_abort_co_read.diff

Modified:
  packages/python-dugong/trunk/debian/changelog
  packages/python-dugong/trunk/debian/patches/series
Deleted:
  packages/python-dugong/trunk/debian/patches/disable_mock_server_logging.diff
  packages/python-dugong/trunk/debian/patches/fix_test_abort_co_read.diff

Modified: packages/python-dugong/trunk/debian/changelog
===================================================================
--- packages/python-dugong/trunk/debian/changelog	2014-07-27 22:56:16 UTC (rev 29972)
+++ packages/python-dugong/trunk/debian/changelog	2014-07-28 00:14:35 UTC (rev 29973)
@@ -1,9 +1,13 @@
-python-dugong (3.1+dfsg-2) UNRELEASED; urgency=medium
+python-dugong (3.2+dfsg-1) UNRELEASED; urgency=medium
 
   * Removed some packaging workarounds for Python 3.3 that are no longer
     required.
+  * New upstream release.
+  * Dropped patches, included upstream:
+    - disable_mock_server_logging.diff
+    - fix_test_abort_co_read.diff
 
- -- Nikolaus Rath <Nikolaus at rath.org>  Thu, 10 Jul 2014 21:21:42 -0700
+ -- Nikolaus Rath <Nikolaus at rath.org>  Sun, 27 Jul 2014 17:06:09 -0700
 
 python-dugong (3.1+dfsg-1) unstable; urgency=medium
 

Deleted: packages/python-dugong/trunk/debian/patches/disable_mock_server_logging.diff
===================================================================
--- packages/python-dugong/trunk/debian/patches/disable_mock_server_logging.diff	2014-07-27 22:56:16 UTC (rev 29972)
+++ packages/python-dugong/trunk/debian/patches/disable_mock_server_logging.diff	2014-07-28 00:14:35 UTC (rev 29973)
@@ -1,21 +0,0 @@
-Author: Nikolaus Rath <Nikolaus at rath.org>
-Origin: https://bitbucket.org/nikratio/python-dugong/commits/03fd905bbb308c664294864880f811bd55742b60
-Forwarded: not-needed
-Last-Update: 2014-06-28
-Applied-Upstream: commit:03fd905
-Description: Don't write mock server logs to stderr
-  This causes the auto test runner to think the tests have failed.
-
---- a/test/test_dugong.py
-+++ b/test/test_dugong.py
-@@ -634,8 +634,8 @@
-     server_version = "MockHTTP"
-     protocol_version = 'HTTP/1.1'
- 
--    #def log_message(self, format, *args):
--    #    pass
-+    def log_message(self, format, *args):
-+        pass
- 
-     def handle_expect_100(self):
-         if self.handle_errors():

Deleted: packages/python-dugong/trunk/debian/patches/fix_test_abort_co_read.diff
===================================================================
--- packages/python-dugong/trunk/debian/patches/fix_test_abort_co_read.diff	2014-07-27 22:56:16 UTC (rev 29972)
+++ packages/python-dugong/trunk/debian/patches/fix_test_abort_co_read.diff	2014-07-28 00:14:35 UTC (rev 29973)
@@ -1,45 +0,0 @@
-Description: Fix sporadic test failure in test_abort_co_read
-Origin: https://bitbucket.org/nikratio/python-dugong/commits/01cbe62b172b581236cefaefeac51d77518c516b
-Forwarded: not-needed
-Last-Update: <2014-06-29>
-Author: Nikolaus Rath <Nikolaus at rath.org>
-
-This patch has been cherry picked from upstream.
-
-
---- a/test/test_dugong.py
-+++ b/test/test_dugong.py
-@@ -399,12 +399,27 @@
-     assert_raises(dugong.ConnectionClosed, conn.read, 200)
- 
- def test_abort_co_read(conn):
--    conn.send_request('GET', '/send_3_300-byte_chunks')
--    resp = conn.read_response()
--    assert resp.status == 200
--    cofun = conn.co_read(450)
--    next(cofun)
--    conn.disconnect()
-+    # We need to delay the write to ensure that we encounter a blocking read
-+    delay = 10
-+    while True:
-+        conn.send_request('GET', '/send_3_300-byte_chunks_delay_%d_ms' % delay)
-+        resp = conn.read_response()
-+        assert resp.status == 200
-+        cofun = conn.co_read(450)
-+        try:
-+            next(cofun)
-+        except StopIteration:
-+            # Not good, need to wait longer
-+            pass
-+        else:
-+            break
-+        finally:
-+            conn.disconnect()
-+
-+        if delay > 5000:
-+            pytest.fail('no blocking read even with %f sec sleep' % delay)
-+        delay *= 2
-+
-     assert_raises(dugong.ConnectionClosed, next, cofun)
- 
- def test_abort_write(conn):

Modified: packages/python-dugong/trunk/debian/patches/series
===================================================================
--- packages/python-dugong/trunk/debian/patches/series	2014-07-27 22:56:16 UTC (rev 29972)
+++ packages/python-dugong/trunk/debian/patches/series	2014-07-28 00:14:35 UTC (rev 29973)
@@ -1,3 +1 @@
 use-local-intersphinx.patch
-disable_mock_server_logging.diff
-fix_test_abort_co_read.diff