Rev 5734: (jelmer) Fix bzrlib.tests.blackbox.test_info when used with --no-plugins. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5734 [merge]
revision-id: pqm at pqm.ubuntu.com-20110323111500-d3u1esqnwwt38wsa
parent: pqm at pqm.ubuntu.com-20110323095651-uaa65kdnqqakpygm
parent: jelmer at samba.org-20110322171658-ducktr1u157lhn31
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-03-23 11:15:00 +0000
message:
  (jelmer) Fix bzrlib.tests.blackbox.test_info when used with --no-plugins.
   (Jelmer Vernooij)
modified:
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- a/bzrlib/tests/blackbox/test_info.py	2011-03-10 13:49:44 +0000
+++ b/bzrlib/tests/blackbox/test_info.py	2011-03-22 17:16:58 +0000
@@ -276,8 +276,12 @@
         tree5 = branch1.create_checkout('lightcheckout', lightweight=True)
         branch5 = tree5.branch
         out, err = self.run_bzr('info -v lightcheckout')
+        if "metaweave" in bzrdir.format_registry:
+            format_description = "knit or metaweave"
+        else:
+            format_description = "knit"
         self.assertEqualDiff(
-"""Lightweight checkout (format: knit or metaweave)
+"""Lightweight checkout (format: %s)
 Location:
   light checkout root: lightcheckout
    checkout of branch: standalone
@@ -306,7 +310,7 @@
 
 Repository:
          1 revision
-""" % (datestring_first, datestring_first,), out)
+""" % (format_description, datestring_first, datestring_first,), out)
         self.assertEqual('', err)
 
         # Update initial standalone branch
@@ -439,7 +443,7 @@
         # Out of date lightweight checkout
         out, err = self.run_bzr('info lightcheckout --verbose')
         self.assertEqualDiff(
-"""Lightweight checkout (format: knit or metaweave)
+"""Lightweight checkout (format: %s)
 Location:
   light checkout root: lightcheckout
    checkout of branch: standalone
@@ -470,7 +474,7 @@
 
 Repository:
          2 revisions
-""" % (datestring_first, datestring_last,), out)
+""" % (format_description, datestring_first, datestring_last,), out)
         self.assertEqual('', err)
 
     def test_info_standalone_no_tree(self):