~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2009-06-05 07:24:41 UTC
  • mto: (4413.2.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 4415.
  • Revision ID: v.ladeuil+lp@free.fr-20090605072441-r2sanvt1wmz1b3jx
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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
728
728
    def finished(self):
729
729
        """See progress.ProgressBar.finished()."""
730
730
 
731
 
    def note(self, fmt_string, *args, **kwargs):
 
731
    def note(self, fmt_string, *args):
732
732
        """See progress.ProgressBar.note()."""
733
 
        self.stdout.write((fmt_string + "\n") % args)
 
733
        if args:
 
734
            fmt_string = fmt_string % args
 
735
        self.stdout.write(fmt_string + "\n")
734
736
 
735
737
    def progress_bar(self):
736
738
        return self