Rev 4678: Fix weird TestSmartServerStreamMedium failure. in file:///home/vila/src/bzr/bugs/freebsd-regressions/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/freebsd-regressions/

------------------------------------------------------------
revno: 4678
revision-id: v.ladeuil+lp at free.fr-20090907084306-a1rd5vn8d6wfsyhq
parent: v.ladeuil+lp at free.fr-20090907084147-3qejx7c6wx30u8lx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: freebsd-regressions
timestamp: Mon 2009-09-07 10:43:06 +0200
message:
  Fix weird TestSmartServerStreamMedium failure.
  
  * bzrlib/tests/test_smart_transport.py:
  (TestSmartServerStreamMedium.test_socket_stream_incomplete_request):
  Pretty weird behavior here... the server socket is closed, yet the
  client needs to read twice ? Line-buffered sockets ???
-------------- next part --------------
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2009-07-08 07:03:38 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2009-09-07 08:43:06 +0000
@@ -732,7 +732,13 @@
         client_sock.sendall(rest_of_request_bytes)
         server._serve_one_request(server_protocol)
         server_sock.close()
-        self.assertEqual(expected_response, client_sock.recv(50),
+        received_lines = []
+        line = client_sock.recv(50)
+        while line:
+            received_lines.append(line)
+            line = client_sock.recv(50)
+        actual_response = ''.join(received_lines)
+        self.assertEqual(expected_response, actual_response,
                          "Not a version 2 response to 'hello' request.")
         self.assertEqual('', client_sock.recv(1))