/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_clean_tree.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_clean_tree.py
1
 
# Copyright (C) 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
import errno
19
18
import os
20
 
import shutil
21
 
import sys
 
19
from StringIO import StringIO
22
20
 
23
 
from .. import tests, ui
24
 
from ..controldir import (
25
 
    ControlDir,
 
21
from bzrlib.bzrdir import (
 
22
    BzrDir,
26
23
    )
27
 
from ..clean_tree import (
 
24
from bzrlib.clean_tree import (
28
25
    clean_tree,
29
26
    iter_deletables,
30
27
    )
31
 
from ..osutils import (
 
28
from bzrlib.osutils import (
32
29
    has_symlinks,
33
30
    )
34
 
from . import (
 
31
from bzrlib.tests import (
35
32
    TestCaseInTempDir,
36
33
    )
37
34
 
42
39
        if has_symlinks() is False:
43
40
            return
44
41
        os.mkdir('branch')
45
 
        ControlDir.create_standalone_workingtree('branch')
 
42
        BzrDir.create_standalone_workingtree('branch')
46
43
        os.symlink(os.path.realpath('no-die-please'), 'branch/die-please')
47
44
        os.mkdir('no-die-please')
48
 
        self.assertPathExists('branch/die-please')
 
45
        self.failUnlessExists('branch/die-please')
49
46
        os.mkdir('no-die-please/child')
50
47
 
51
48
        clean_tree('branch', unknown=True, no_prompt=True)
52
 
        self.assertPathExists('no-die-please')
53
 
        self.assertPathExists('no-die-please/child')
 
49
        self.failUnlessExists('no-die-please')
 
50
        self.failUnlessExists('no-die-please/child')
54
51
 
55
52
    def test_iter_deletable(self):
56
53
        """Files are selected for deletion appropriately"""
57
54
        os.mkdir('branch')
58
 
        tree = ControlDir.create_standalone_workingtree('branch')
59
 
        transport = tree.controldir.root_transport
60
 
        transport.put_bytes('.bzrignore', b'*~\n*.pyc\n.bzrignore\n')
61
 
        transport.put_bytes('file.BASE', b'contents')
62
 
        with tree.lock_write():
 
55
        tree = BzrDir.create_standalone_workingtree('branch')
 
56
        transport = tree.bzrdir.root_transport
 
57
        transport.put_bytes('.bzrignore', '*~\n*.pyc\n.bzrignore\n')
 
58
        transport.put_bytes('file.BASE', 'contents')
 
59
        tree.lock_write()
 
60
        try:
63
61
            self.assertEqual(len(list(iter_deletables(tree, unknown=True))), 1)
64
 
            transport.put_bytes('file', b'contents')
65
 
            transport.put_bytes('file~', b'contents')
66
 
            transport.put_bytes('file.pyc', b'contents')
67
 
            dels = sorted([r for a, r in iter_deletables(tree, unknown=True)])
 
62
            transport.put_bytes('file', 'contents')
 
63
            transport.put_bytes('file~', 'contents')
 
64
            transport.put_bytes('file.pyc', 'contents')
 
65
            dels = sorted([r for a,r in iter_deletables(tree, unknown=True)])
68
66
            self.assertEqual(['file', 'file.BASE'], dels)
69
67
 
70
 
            dels = [r for a, r in iter_deletables(tree, detritus=True)]
 
68
            dels = [r for a,r in iter_deletables(tree, detritus=True)]
71
69
            self.assertEqual(sorted(['file~', 'file.BASE']), dels)
72
70
 
73
 
            dels = [r for a, r in iter_deletables(tree, ignored=True)]
 
71
            dels = [r for a,r in iter_deletables(tree, ignored=True)]
74
72
            self.assertEqual(sorted(['file~', 'file.pyc', '.bzrignore']),
75
73
                             dels)
76
74
 
77
 
            dels = [r for a, r in iter_deletables(tree, unknown=False)]
 
75
            dels = [r for a,r in iter_deletables(tree, unknown=False)]
78
76
            self.assertEqual([], dels)
79
 
 
80
 
    def test_delete_items_warnings(self):
81
 
        """Ensure delete_items issues warnings on EACCES. (bug #430785)
82
 
        """
83
 
        def _dummy_unlink(path):
84
 
            """unlink() files other than files named '0foo'.
85
 
            """
86
 
            if path.endswith('0foo'):
87
 
                # Simulate 'permission denied' error.
88
 
                # This should show up as a warning for the
89
 
                # user.
90
 
                e = OSError()
91
 
                e.errno = errno.EACCES
92
 
                raise e
93
 
 
94
 
        def _dummy_rmtree(path, ignore_errors=False, onerror=None):
95
 
            """Call user supplied error handler onerror.
96
 
            """
97
 
            # Indicate failure in removing 'path' if path is subdir0
98
 
            # We later check to ensure that this is indicated
99
 
            # to the user as a warning. We raise OSError to construct
100
 
            # proper excinfo that needs to be passed to onerror
101
 
            try:
102
 
                raise OSError
103
 
            except OSError as e:
104
 
                e.errno = errno.EACCES
105
 
                excinfo = sys.exc_info()
106
 
                function = os.remove
107
 
                if 'subdir0' not in path:
108
 
                    # onerror should show warning only for os.remove
109
 
                    # error. For any other failures the error should
110
 
                    # be shown to the user.
111
 
                    function = os.listdir
112
 
                onerror(function=function,
113
 
                        path=path, excinfo=excinfo)
114
 
 
115
 
        self.overrideAttr(os, 'unlink', _dummy_unlink)
116
 
        self.overrideAttr(shutil, 'rmtree', _dummy_rmtree)
117
 
        ui.ui_factory = tests.TestUIFactory()
118
 
        stderr = ui.ui_factory.stderr
119
 
 
120
 
        ControlDir.create_standalone_workingtree('.')
121
 
        self.build_tree(['0foo', '1bar', '2baz', 'subdir0/'])
122
 
        clean_tree('.', unknown=True, no_prompt=True)
123
 
        self.assertContainsRe(stderr.getvalue(),
124
 
                              'bzr: warning: unable to remove.*0foo')
125
 
        self.assertContainsRe(stderr.getvalue(),
126
 
                              'bzr: warning: unable to remove.*subdir0')
127
 
 
128
 
        # Ensure that error other than EACCES during os.remove are
129
 
        # not turned into warnings.
130
 
        self.build_tree(['subdir1/'])
131
 
        self.assertRaises(OSError, clean_tree, '.',
132
 
                          unknown=True, no_prompt=True)
 
77
        finally:
 
78
            tree.unlock()