← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-04 16:06:36 UTC
  • mfrom: (5007 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100204160636-xqeuwz8bwt8bbts4
Merge bzr.dev 5007, resolve conflict, update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
465
465
        repo = self.make_repository('.',
466
466
                format=bzrdir.format_registry.get('knit')())
467
467
        inv_xml = '<inventory format="5">\n</inventory>\n'
468
 
        inv = repo.deserialise_inventory('test-rev-id', inv_xml)
 
468
        inv = repo._deserialise_inventory('test-rev-id', inv_xml)
469
469
        self.assertEqual('test-rev-id', inv.root.revision)
470
470
 
471
471
    def test_deserialise_uses_global_revision_id(self):
477
477
        # Arguably, the deserialise_inventory should detect a mismatch, and
478
478
        # raise an error, rather than silently using one revision_id over the
479
479
        # other.
480
 
        self.assertRaises(AssertionError, repo.deserialise_inventory,
 
480
        self.assertRaises(AssertionError, repo._deserialise_inventory,
481
481
            'test-rev-id', inv_xml)
482
 
        inv = repo.deserialise_inventory('other-rev-id', inv_xml)
 
482
        inv = repo._deserialise_inventory('other-rev-id', inv_xml)
483
483
        self.assertEqual('other-rev-id', inv.root.revision)
484
484
 
485
485
    def test_supports_external_lookups(self):