Rev 4679: Force IPV4 to fix failure on IPV6-enabled hosts. in file:///home/vila/src/bzr/bugs/controversial/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4679
revision-id: v.ladeuil+lp at free.fr-20090908033131-429xxv4ekhp7jr18
parent: v.ladeuil+lp at free.fr-20090907090502-zm0gtarwt0nnscjs
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: controversial
timestamp: Tue 2009-09-08 05:31:31 +0200
message:
  Force IPV4 to fix failure on IPV6-enabled hosts.
  
  * bzrlib/tests/blackbox/test_serve.py:
  (TestCmdServeChrooting.test_serve_tcp): Force IPv4.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py	2009-09-07 08:57:12 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py	2009-09-08 03:31:31 +0000
@@ -255,20 +255,14 @@
         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.
-        if sys.platform.startswith('freebsd'):
-            # Something fishy is going on there, the server is able to publish
-            # the port it is listening too, yet the client can't connect...
-            # The assertion below should fail when the problem is fixed or the
-            # test rewritten.
-            self.assertRaises(AttributeError, getattr, self, 'client_resp')
-        else:
-            self.assertEqual(('norepository',), self.client_resp)
+        self.assertEqual(('norepository',), self.client_resp)
 
     def run_bzr_serve_then_func(self, serve_args, func, *func_args,
             **func_kwargs):