Rev 3668: Fix a test that was expected to fail. in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 3668
revision-id: john at arbash-meinel.com-20080829210816-3io9u83nt12ul2z2
parent: john at arbash-meinel.com-20080829193335-wqvq1tn2j6aksapn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-08-29 16:08:16 -0500
message:
  Fix a test that was expected to fail.
  It doesn't anymore because 1.6.1-rich-root can stack on a
  rich-root-pack.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py	2008-08-28 21:24:49 +0000
+++ b/bzrlib/tests/test_bzrdir.py	2008-08-29 21:08:16 +0000
@@ -489,15 +489,8 @@
     def test_sprout_upgrades_to_rich_root_format_if_needed(self):
         child_branch, new_child_transport = self.prepare_default_stacking(
             child_format='rich-root-pack')
-        def do_sprout():
-            try:
-                return child_branch.bzrdir.sprout(new_child_transport.base,
-                                                  stacked=True)
-            except errors.IncompatibleRepositories:
-                raise AssertionError(
-                    'Rich root format should be sprout-compatible')
-        self.expectFailure('Rich root format should be sprout-compatible',
-                           do_sprout)
+        new_child = child_branch.bzrdir.sprout(new_child_transport.base,
+                                               stacked=True)
         repo = new_child.open_repository()
         self.assertTrue(repo._format.supports_external_lookups)
         self.assertTrue(repo.supports_rich_root())