← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2007-09-20 09:42:38 UTC
  • mfrom: (2831.5.3 commit.builder)
  • mto: This revision was merged to the branch mainline in revision 2838.
  • Revision ID: v.ladeuil+lp@free.fr-20070920094238-jpxvr4qiwspsftzr
Fix osutils_delete_any and use it in the test suite

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/test_commit_builder.py
16
16
 
17
17
"""Tests for repository commit builder."""
18
18
 
19
 
from errno import EISDIR
 
19
import errno
20
20
import os
21
 
 
22
 
from bzrlib import inventory
23
 
from bzrlib.errors import NonAsciiRevisionId, CannotSetRevisionId
24
 
from bzrlib.repository import CommitBuilder
25
 
from bzrlib import tests
26
 
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
27
 
 
28
 
 
29
 
class TestCommitBuilder(TestCaseWithRepository):
 
21
import sys
 
22
 
 
23
from bzrlib import (
 
24
    errors,
 
25
    inventory,
 
26
    osutils,
 
27
    repository,
 
28
    tests,
 
29
    )
 
30
from bzrlib.tests.repository_implementations import test_repository
 
31
 
 
32
 
 
33
class TestCommitBuilder(test_repository.TestCaseWithRepository):
30
34
 
31
35
    def test_get_commit_builder(self):
32
36
        branch = self.make_branch('.')
33
37
        branch.repository.lock_write()
34
38
        builder = branch.repository.get_commit_builder(
35
39
            branch, [], branch.get_config())
36
 
        self.assertIsInstance(builder, CommitBuilder)
 
40
        self.assertIsInstance(builder, repository.CommitBuilder)
37
41
        self.assertTrue(builder.random_revid)
38
42
        branch.repository.commit_write_group()
39
43
        branch.repository.unlock()
95
99
                try:
96
100
                    builder = tree.branch.get_commit_builder([],
97
101
                        revision_id=revision_id)
98
 
                except NonAsciiRevisionId:
 
102
                except errors.NonAsciiRevisionId:
99
103
                    revision_id = 'abc'
100
104
                    builder = tree.branch.get_commit_builder([],
101
105
                        revision_id=revision_id)
102
 
            except CannotSetRevisionId:
 
106
            except errors.CannotSetRevisionId:
103
107
                # This format doesn't support supplied revision ids
104
108
                return
105
109
            self.assertFalse(builder.random_revid)
416
420
        tree = self.make_branch_and_tree('.')
417
421
        path = 'name'
418
422
        make_before(path)
 
423
 
419
424
        def change_kind():
420
 
            try:
421
 
                os.unlink(path)
422
 
            except OSError, e:
423
 
                if e.errno != EISDIR:
424
 
                    raise
425
 
                os.rmdir(path)
 
425
            osutils.delete_any(path)
426
426
            make_after(path)
 
427
 
427
428
        self._add_commit_change_check_changed(tree, path, change_kind)
428
429
 
429
430
    def test_last_modified_dir_file(self):