← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-04 17:38:09 UTC
  • mfrom: (5805.1.1 no-inventory)
  • Revision ID: pqm@pqm.ubuntu.com-20110504173809-otz0gw0cvf2z9jbk
(jelmer) Avoid using inventories in some repository tests. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
26
26
from bzrlib.bzrdir import BzrDirMetaFormat1
27
27
from bzrlib.commit import Commit, NullCommitReporter
28
28
from bzrlib.config import BranchConfig
29
 
from bzrlib.errors import (
30
 
    PointlessCommit,
31
 
    BzrError,
32
 
    SigningFailed,
33
 
    LockContention,
34
 
    )
 
29
from bzrlib.errors import (PointlessCommit, BzrError, SigningFailed,
 
30
                           LockContention)
35
31
from bzrlib.tests import (
36
32
    SymlinkFeature,
37
33
    TestCaseWithTransport,
38
34
    test_foreign,
39
35
    )
40
 
from bzrlib.tests.matchers import MatchesAncestry
41
36
 
42
37
 
43
38
# TODO: Test commit with some added, and added-but-missing files
362
357
        eq = self.assertEquals
363
358
        eq(b.revision_history(), rev_ids)
364
359
        for i in range(4):
365
 
            self.assertThat(rev_ids[:i+1],
366
 
                MatchesAncestry(b.repository, rev_ids[i]))
 
360
            anc = b.repository.get_ancestry(rev_ids[i])
 
361
            eq(anc, [None] + rev_ids[:i+1])
367
362
 
368
363
    def test_commit_new_subdir_child_selective(self):
369
364
        wt = self.make_branch_and_tree('.')