← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branchbuilder.py

  • Committer: Robert Collins
  • Date: 2007-04-27 03:39:09 UTC
  • mto: (2495.3.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2498.
  • Revision ID: robertc@robertcollins.net-20070427033909-bsuz8ogd7r75dbfl
Return the commited revision id from BranchBuilder.build_commit to save later instrospection.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branchbuilder.py
45
45
    def test_build_one_commit(self):
46
46
        """doing build_commit causes a commit to happen."""
47
47
        builder = BranchBuilder(self.get_transport().clone('foo'))
48
 
        builder.build_commit()
 
48
        rev_id = builder.build_commit()
49
49
        branch = builder.get_branch()
50
 
        self.assertEqual(1, branch.last_revision_info()[0])
51
 
        # we dont care what the revision id is.
 
50
        self.assertEqual((1, rev_id), branch.last_revision_info())
52
51
        self.assertEqual(
53
52
            'commit 1',
54
53
            branch.repository.get_revision(branch.last_revision()).message)
56
55
    def test_build_two_commits(self):
57
56
        """The second commit has the right parents and message."""
58
57
        builder = BranchBuilder(self.get_transport().clone('foo'))
59
 
        builder.build_commit()
60
 
        builder.build_commit()
 
58
        rev_id1 = builder.build_commit()
 
59
        rev_id2 = builder.build_commit()
61
60
        branch = builder.get_branch()
62
 
        self.assertEqual(2, branch.last_revision_info()[0])
63
 
        # we dont care what the revision id is.
 
61
        self.assertEqual((2, rev_id2), branch.last_revision_info())
64
62
        self.assertEqual(
65
63
            'commit 2',
66
64
            branch.repository.get_revision(branch.last_revision()).message)
67
65
        self.assertEqual(
68
 
            [branch.revision_history()[0]],
 
66
            [rev_id1],
69
67
            branch.repository.get_revision(branch.last_revision()).parent_ids)