← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_commit_builder.py

  • Committer: Martin Pool
  • Date: 2010-08-18 04:26:39 UTC
  • mfrom: (129.1.8 packaging-karmic)
  • Revision ID: mbp@sourcefrog.net-20100818042639-mjoxtngyjwiu05fo
* PPA rebuild for lucid.
* PPA rebuild for karmic.
* PPA rebuild onto jaunty.
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_commit_builder.py
16
16
 
17
17
"""Tests for repository commit builder."""
18
18
 
19
 
from copy import copy
20
 
import errno
21
19
import os
22
 
import sys
23
20
 
24
21
from bzrlib import (
25
22
    errors,
 
23
    graph,
26
24
    inventory,
27
25
    osutils,
28
26
    repository,
29
27
    revision as _mod_revision,
30
28
    tests,
31
29
    )
32
 
from bzrlib.graph import Graph
33
 
from bzrlib.tests.per_repository import test_repository
34
 
 
35
 
 
36
 
class TestCommitBuilder(test_repository.TestCaseWithRepository):
 
30
from bzrlib.tests import per_repository
 
31
 
 
32
 
 
33
class TestCommitBuilder(per_repository.TestCaseWithRepository):
37
34
 
38
35
    def test_get_commit_builder(self):
39
36
        branch = self.make_branch('.')
196
193
        self.assertEqual(revision_id,
197
194
            tree.branch.repository.get_inventory(revision_id).revision_id)
198
195
 
 
196
    def test_commit_without_root_errors(self):
 
197
        tree = self.make_branch_and_tree(".")
 
198
        tree.lock_write()
 
199
        try:
 
200
            builder = tree.branch.get_commit_builder([])
 
201
            def do_commit():
 
202
                try:
 
203
                    list(builder.record_iter_changes(
 
204
                        tree, tree.last_revision(), []))
 
205
                    builder.finish_inventory()
 
206
                except:
 
207
                    builder.abort()
 
208
                    raise
 
209
            self.assertRaises(errors.RootMissing, do_commit)
 
210
        finally:
 
211
            tree.unlock()
 
212
 
199
213
    def test_commit_without_root_or_record_iter_changes_errors(self):
200
214
        tree = self.make_branch_and_tree(".")
201
215
        tree.lock_write()
924
938
        # (closest to a public per-file graph API we have today)
925
939
        tree.lock_read()
926
940
        self.addCleanup(tree.unlock)
927
 
        graph = dict(Graph(tree.branch.repository.texts).iter_ancestry([tip]))
928
 
        self.assertEqual(expected_graph, graph)
 
941
        g = dict(graph.Graph(tree.branch.repository.texts).iter_ancestry([tip]))
 
942
        self.assertEqual(expected_graph, g)
929
943
 
930
944
    def test_last_modified_revision_after_content_file_changes(self):
931
945
        # altering a file changes the last modified.