Rev 4678: Fix weird TestSmartServerStreamMedium failure on FreeBSD. in file:///home/vila/src/bzr/bugs/controversial/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/controversial/

------------------------------------------------------------
revno: 4678
revision-id: v.ladeuil+lp at free.fr-20090907090502-zm0gtarwt0nnscjs
parent: v.ladeuil+lp at free.fr-20090907085712-nsxk646vprruyipm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: controversial
timestamp: Mon 2009-09-07 11:05:02 +0200
message:
  Fix weird TestSmartServerStreamMedium failure on FreeBSD.
  
  * test_smart_transport.py:
  (TestSmartServerStreamMedium.test_socket_stream_incomplete_request):
  Pretty weird behavior on FreeBSD here... the server socket is
  closed, yet the client needs to read stwice ? 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 09:05:02 +0000
@@ -732,7 +732,7 @@
         client_sock.sendall(rest_of_request_bytes)
         server._serve_one_request(server_protocol)
         server_sock.close()
-        self.assertEqual(expected_response, client_sock.recv(50),
+        self.assertEqual(expected_response, osutils.recv_all(client_sock, 50),
                          "Not a version 2 response to 'hello' request.")
         self.assertEqual('', client_sock.recv(1))