Rev 6515: (jelmer) Consistently use 127.0.0.1 for setting up a blackbox server and in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6515 [merge]
revision-id: pqm at pqm.ubuntu.com-20120330013338-d3vspfdtj6dvnc0c
parent: pqm at pqm.ubuntu.com-20120330010848-zogzer4l3exctrbk
parent: jelmer at samba.org-20120321135839-epad44x2m38127oh
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2012-03-30 01:33:38 +0000
message:
  (jelmer) Consistently use 127.0.0.1 for setting up a blackbox server and
   connecting to it. (Jelmer Vernooij)
modified:
  bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
  bzrlib/tests/test_mergetools.py bzrlibteststest_merg-20100701052504-knb0llvufl26fxgx-2
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py	2012-03-06 17:17:27 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py	2012-03-21 13:58:39 +0000
@@ -354,7 +354,7 @@
         t = self.get_transport()
         t.mkdir('server-root')
         self.run_bzr_serve_then_func(
-            ['--listen', 'localhost', '--port', '0',
+            ['--listen', '127.0.0.1', '--port', '0',
              '--directory', t.local_abspath('server-root'),
              '--allow-writes'],
             func=self.when_server_started)

=== modified file 'bzrlib/tests/test_mergetools.py'
--- a/bzrlib/tests/test_mergetools.py	2012-02-28 04:58:14 +0000
+++ b/bzrlib/tests/test_mergetools.py	2012-03-21 10:48:58 +0000
@@ -15,7 +15,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import os
-import re
 import sys
 import tempfile
 
@@ -23,7 +22,6 @@
     mergetools,
     tests
 )
-from bzrlib.tests.features import backslashdir_feature
 
 
 class TestFilenameSubstitution(tests.TestCaseInTempDir):
@@ -39,7 +37,7 @@
              '-o',
              'test.txt'],
             args)
-        
+
     def test_spaces(self):
         cmd_list = ['kdiff3', '{base}', '{this}', '{other}', '-o', '{result}']
         args, tmpfile = mergetools._subst_filename(cmd_list,
@@ -107,7 +105,7 @@
             ('test.txt.THIS', 'this stuff'),
             ('test.txt.OTHER', 'other stuff'),
         ))
-        
+
     def test_invoke_expands_exe_path(self):
         self.overrideEnv('PATH', os.path.dirname(sys.executable))
         def dummy_invoker(exe, args, cleanup):
@@ -120,7 +118,7 @@
         self.assertEqual(0, retcode)
         self.assertEqual(sys.executable, self._exe)
         self.assertEqual(['test.txt'], self._args)
-        
+
     def test_success(self):
         def dummy_invoker(exe, args, cleanup):
             self._exe = exe
@@ -131,7 +129,7 @@
         self.assertEqual(0, retcode)
         self.assertEqual('tool', self._exe)
         self.assertEqual(['test.txt'], self._args)
-    
+
     def test_failure(self):
         def dummy_invoker(exe, args, cleanup):
             self._exe = exe
@@ -159,7 +157,7 @@
         self.assertEqual('tool', self._exe)
         self.assertPathDoesNotExist(self._args[0])
         self.assertFileEqual('temp stuff', 'test.txt')
-    
+
     def test_failure_tempfile(self):
         def dummy_invoker(exe, args, cleanup):
             self._exe = exe