← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-14 16:16:53 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1919.
  • Revision ID: john@arbash-meinel.com-20060814161653-54cdcdadcd4e9003
Remove bogus entry from BRANCH.TODO

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
27
27
from bzrlib.bundle.serializer import write_bundle, read_bundle
28
28
from bzrlib.branch import Branch
29
29
from bzrlib.diff import internal_diff
30
 
from bzrlib.errors import (BzrError, TestamentMismatch, NotABundle, BadBundle, 
31
 
                           NoSuchFile,)
 
30
from bzrlib.errors import BzrError, TestamentMismatch, NotABundle, BadBundle
32
31
from bzrlib.merge import Merge3Merger
33
32
from bzrlib.osutils import has_symlinks, sha_file
34
33
from bzrlib.tests import (TestCaseInTempDir, TestCaseWithTransport,
412
411
            for inventory_id in old:
413
412
                try:
414
413
                    old_file = old.get_file(inventory_id)
415
 
                except NoSuchFile:
 
414
                except:
416
415
                    continue
417
416
                if old_file is None:
418
417
                    continue
800
799
        self.assertEqual(19800, rev.timezone)
801
800
        self.assertEqual(1152544886.0, rev.timestamp)
802
801
 
803
 
    def test_bundle_root_id(self):
804
 
        self.tree1 = self.make_branch_and_tree('b1')
805
 
        self.b1 = self.tree1.branch
806
 
        self.tree1.commit('message', rev_id='revid1')
807
 
        bundle = self.get_valid_bundle(None, 'revid1')
808
 
        tree = bundle.revision_tree(self.b1.repository, 'revid1')
809
 
        self.assertEqual('revid1', tree.inventory.root.revision)
810
 
 
811
802
 
812
803
class MungedBundleTester(TestCaseWithTransport):
813
804