[ARVADOS] updated: bde53a1d5c1e55c42f9c38c5426b9a8a0acb8219

[git at public.curoverse.com]

Summary of changes:
 sdk/python/tests/keepstub.py         | 9 +++++++++
 sdk/python/tests/test_collections.py | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

       via  bde53a1d5c1e55c42f9c38c5426b9a8a0acb8219 (commit)
      from  6083e43206e7bfca226ab706a2968899f2eddb07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bde53a1d5c1e55c42f9c38c5426b9a8a0acb8219
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Apr 30 17:14:07 2015 -0400

    5562: keepstub sends "100 Continue" to client.  Fix test_write_three_replicas
    to return a valid response body instead of None.

diff --git a/sdk/python/tests/keepstub.py b/sdk/python/tests/keepstub.py
index e84230a..ef724ed 100644
--- a/sdk/python/tests/keepstub.py
+++ b/sdk/python/tests/keepstub.py
@@ -65,6 +65,15 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler, object):
 
     def do_PUT(self):
         self.server._do_delay('request_body')
+
+        # The comments at https://bugs.python.org/issue1491 implies that Python
+        # 2.7 BaseHTTPRequestHandler was patched to support 100 Continue, but
+        # reading the actual code that ships in Debian it clearly is not, so we
+        # need to send the response on the socket directly.
+
+        self.wfile.write("%s %d %s\r\n\r\n" %
+                         (self.protocol_version, 100, "Continue"))
+
         data = self.rfile.read(int(self.headers.getheader('content-length')))
         datahash = hashlib.md5(data).hexdigest()
         self.server.store[datahash] = data
diff --git a/sdk/python/tests/test_collections.py b/sdk/python/tests/test_collections.py
index a397f44..5e1a055 100644
--- a/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@ -712,7 +712,7 @@ class CollectionWriterTestCase(unittest.TestCase, CollectionTestMixin):
     def test_write_three_replicas(self):
         client = mock.MagicMock(name='api_client')
         with self.mock_keep(
-                None, 500, 500, 500, 200, 200, 200,
+                "", 500, 500, 500, 200, 200, 200,
                 **{'x-keep-replicas-stored': 1}) as keepmock:
             self.mock_keep_services(client, status=200, service_type='disk', count=6)
             writer = self.foo_writer(api_client=client, replication=3)

-----------------------------------------------------------------------


hooks/post-receive
--