Rev 3533: Use the new series work to make the tests finish even faster. in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

------------------------------------------------------------
revno: 3533
revision-id: john at arbash-meinel.com-20080722204243-g10pvu93lxihrpk7
parent: john at arbash-meinel.com-20080722204114-jw0j6e5i1p7ecpo9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_lca_multi
timestamp: Tue 2008-07-22 15:42:43 -0500
message:
  Use the new series work to make the tests finish even faster.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py	2008-07-22 20:17:36 +0000
+++ b/bzrlib/tests/test_merge.py	2008-07-22 20:42:43 +0000
@@ -1117,6 +1117,8 @@
         :return: A BranchBuilder
         """
         builder = self.make_branch_builder('path')
+        builder.start_series()
+        self.addCleanup(builder.finish_series)
         builder.build_snapshot('A-id', None,
             [('add', ('', None, 'directory', None))])
         builder.build_snapshot('C-id', ['A-id'], [])
@@ -1196,6 +1198,8 @@
 
     def test__entries_lca_simple(self):
         builder = self.make_branch_builder('tree')
+        builder.start_series()
+        self.addCleanup(builder.finish_series)
         builder.build_snapshot('A-id', None,
             [('add', (u'', 'a-root-id', 'directory', None)),
              ('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])