/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

Move all features to bzrlib.tests.features in 2.5

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 (PointlessCommit, BzrError, SigningFailed,
30
 
                           LockContention)
 
29
from bzrlib.errors import (
 
30
    PointlessCommit,
 
31
    BzrError,
 
32
    SigningFailed,
 
33
    LockContention,
 
34
    )
31
35
from bzrlib.tests import (
32
36
    TestCaseWithTransport,
33
37
    test_foreign,
35
39
from bzrlib.tests.features import (
36
40
    SymlinkFeature,
37
41
    )
 
42
from bzrlib.tests.matchers import MatchesAncestry
38
43
 
39
44
 
40
45
# TODO: Test commit with some added, and added-but-missing files
359
364
        eq = self.assertEquals
360
365
        eq(b.revision_history(), rev_ids)
361
366
        for i in range(4):
362
 
            anc = b.repository.get_ancestry(rev_ids[i])
363
 
            eq(anc, [None] + rev_ids[:i+1])
 
367
            self.assertThat(rev_ids[:i+1],
 
368
                MatchesAncestry(b.repository, rev_ids[i]))
364
369
 
365
370
    def test_commit_new_subdir_child_selective(self):
366
371
        wt = self.make_branch_and_tree('.')