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

[John A Meinel]

[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 :-/).

[John A Meinel (jameinel)]

Sorry about the 'Resubmit' but code-review generated the preview against an old version of bzr.dev, and I didn't want to have to re-review my patch again. Will review now.

[John A Meinel (jameinel)]

This seems like a little bit of a band-aid, though I suppose people won't intermix

 note('foo %s %%s' % one, two)

Certainly the recommended form has been note('foo %s %s', one, two)

Anyway, both are better than before.

review: Approve

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2009-06-05 07:14:08 +0000
+++ bzrlib/tests/__init__.py	2009-06-05 14:35:11 +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 14:35:11 +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: