~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/repository_implementations/test_repository.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-08-19 15:25:36 UTC
  • mfrom: (3640.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
(jam) Merge in bzr-1.6rc4 including the fix for bug #256757

Show diffs side-by-side

added added

removed removed

Lines of Context:
68
68
        """Test the the _fetch_order attribute."""
69
69
        tree = self.make_branch_and_tree('tree')
70
70
        repo = tree.branch.repository
71
 
        self.assertTrue(repo._fetch_order in ('topological', 'unsorted'))
 
71
        self.assertTrue(repo._fetch_order in ('topological', 'unordered'))
72
72
 
73
73
    def test_attribute__fetch_uses_deltas(self):
74
74
        """Test the the _fetch_uses_deltas attribute."""
949
949
        self.assertRaises(errors.NoSuchRevision,
950
950
                          self.bzrdir.open_repository().get_ancestry, 'orphan')
951
951
 
952
 
    def test_get_unsorted_ancestry(self):
 
952
    def test_get_unordered_ancestry(self):
953
953
        repo = self.bzrdir.open_repository()
954
954
        self.assertEqual(set(repo.get_ancestry('rev3')),
955
955
                         set(repo.get_ancestry('rev3', topo_sorted=False)))