Rev 4679: (vila) More test fixes for FreeBSD passing the full test suite in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4679 [merge]
revision-id: pqm at pqm.ubuntu.com-20090908065926-at5dgy2j2spzl8u5
parent: pqm at pqm.ubuntu.com-20090908035617-cim7fx49sqgmbv6f
parent: v.ladeuil+lp at free.fr-20090908062101-r6skh3lwr02kd293
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-09-08 07:59:26 +0100
message:
  (vila) More test fixes for FreeBSD passing the full test suite
modified:
  bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py	2009-08-27 22:17:35 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py	2009-09-08 03:31:31 +0000
@@ -255,14 +255,15 @@
         t = self.get_transport()
         t.mkdir('server-root')
         self.run_bzr_serve_then_func(
-            ['--port', '0', '--directory', t.local_abspath('server-root'),
+            ['--port', '127.0.0.1:0',
+             '--directory', t.local_abspath('server-root'),
              '--allow-writes'],
             self.when_server_started)
         # The when_server_started method issued a find_repositoryV3 that should
         # fail with 'norepository' because there are no repositories inside the
         # --directory.
         self.assertEqual(('norepository',), self.client_resp)
-        
+
     def run_bzr_serve_then_func(self, serve_args, func, *func_args,
             **func_kwargs):
         """Run 'bzr serve', and run the given func in a thread once the server

=== 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))