Rev 2746: exempt experimental-* formats from test_describe_checkout_format in http://sourcefrog.net/bzr/pack-repository

Martin Pool mbp at sourcefrog.net
Tue Aug 28 10:51:10 BST 2007


At http://sourcefrog.net/bzr/pack-repository

------------------------------------------------------------
revno: 2746
revision-id: mbp at sourcefrog.net-20070828095109-8ljoy65xsu2dv0pf
parent: mbp at sourcefrog.net-20070828081705-xej6l2h4wpp3fyi2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: pack-repository
timestamp: Tue 2007-08-28 19:51:09 +1000
message:
  exempt experimental-* formats from test_describe_checkout_format
modified:
  bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
=== modified file 'bzrlib/tests/test_info.py'
--- a/bzrlib/tests/test_info.py	2007-07-06 21:20:10 +0000
+++ b/bzrlib/tests/test_info.py	2007-08-28 09:51:09 +0000
@@ -97,8 +97,11 @@
                 bzrdir.format_registry.make_bzrdir(format).workingtree_format
             control.create_workingtree()
             tree = workingtree.WorkingTree.open('%s_co' % format)
-            self.assertEqual(expected, info.describe_format(tree.bzrdir,
-                tree.branch.repository, tree.branch, tree))
+            format_description = info.describe_format(tree.bzrdir,
+                    tree.branch.repository, tree.branch, tree)
+            self.assertEqual(expected, format_description,
+                "checkout of format called %r was described as %r" %
+                (expected, format_description))
         finally:
             control._format.workingtree_format = old_format
 
@@ -128,7 +131,10 @@
 
     def test_describe_checkout_format(self):
         for key in bzrdir.format_registry.keys():
-            if key in ('default', 'weave'):
+            if key in ('default', 'weave', 'experimental'):
+                continue
+            if key.startswith('experimental-'):
+                # these are typically hidden or aliases for other formats
                 continue
             expected = None
             if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree'):




More information about the bazaar-commits mailing list