Merge lp:~vila/bzr/osx-regressions into lp:~bzr/bzr/trunk-old

[Vincent Ladeuil]

[Vincent Ladeuil (vila)]

This patch fixes some test failures revealed on OSX 10.5 with python 2.6.

It seems that OSX changed the way it creates temp directories and that they can
now contain funny characters (including %), that's for the note() fix.

It also seems that '+' can appear repeatedly in these paths, which revealed
the wrong order used for the assertNotContainsRe() call (well known trap :-/).

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2009-06-04 21:25:46 +0000
+++ bzrlib/tests/__init__.py	2009-06-05 08:35:08 +0000
@@ -728,9 +728,11 @@
     def finished(self):
         """See progress.ProgressBar.finished()."""
 
-    def note(self, fmt_string, *args, **kwargs):
+    def note(self, fmt_string, *args):
         """See progress.ProgressBar.note()."""
-        self.stdout.write((fmt_string + "\n") % args)
+        if args:
+            fmt_string = fmt_string % args
+        self.stdout.write(fmt_string + "\n")
 
     def progress_bar(self):
         return self
 
=== modified file 'bzrlib/tests/test_plugins.py'
--- bzrlib/tests/test_plugins.py	2009-03-24 01:53:42 +0000
+++ bzrlib/tests/test_plugins.py	2009-06-05 08:35:08 +0000
@@ -633,7 +633,7 @@
         path = plugin.get_standard_plugins_path()
         self.assertEqual(plugin.get_default_plugin_path(), path[0])
         for directory in path:
-            self.assertNotContainsRe(r'\\/$', directory)
+            self.assertNotContainsRe(directory, r'\\/$')
         try:
             from distutils.sysconfig import get_python_lib
         except ImportError: