Rev 4415: (vila) Fix some OSX test regressions in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4415
revision-id: pqm at pqm.ubuntu.com-20090605155813-4bxv90z2pchl0jwd
parent: pqm at pqm.ubuntu.com-20090605150317-n3bjy7kqjvizgiv6
parent: v.ladeuil+lp at free.fr-20090605135912-olz1prui04uqc1xg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-05 16:58:13 +0100
message:
  (vila) Fix some OSX test regressions
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
    ------------------------------------------------------------
    revno: 4413.2.1
    revision-id: v.ladeuil+lp at free.fr-20090605135912-olz1prui04uqc1xg
    parent: pqm at pqm.ubuntu.com-20090605081039-abvojdsxjbg5i4ff
    parent: v.ladeuil+lp at free.fr-20090605072441-r2sanvt1wmz1b3jx
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: trunk
    timestamp: Fri 2009-06-05 15:59:12 +0200
    message:
      Fix some OSX test regressions
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
    ------------------------------------------------------------
    revno: 4412.2.1
    revision-id: v.ladeuil+lp at free.fr-20090605072441-r2sanvt1wmz1b3jx
    parent: pqm at pqm.ubuntu.com-20090605045030-yj7sm39ao623zoqo
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: osx-regressions
    timestamp: Fri 2009-06-05 09:24:41 +0200
    message:
      Fix some OSX test regressions (well actual test bugs indeed).
      
      * bzrlib/tests/test_plugins.py:
      (TestPluginPaths.test_get_standard_plugins_path): Fix parameter
      order.
      
      * bzrlib/tests/__init__.py:
      (TestUIFactory.note): Delete unused kwargs. Check args to avoid
      trying to expanse formats that contain '%' chars.
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-06-05 07:14:08 +0000
+++ b/bzrlib/tests/__init__.py	2009-06-05 13:59:12 +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'
--- a/bzrlib/tests/test_plugins.py	2009-03-24 01:53:42 +0000
+++ b/bzrlib/tests/test_plugins.py	2009-06-05 07:24:41 +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: