← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_remove.py

  • Committer: Marius Kruger
  • Date: 2007-04-16 01:00:20 UTC
  • mto: This revision was merged to the branch mainline in revision 2455.
  • Revision ID: amanic@gmail.com-20070416010020-3jan8hje4qmbwdsh
* Add utility method delta.get_changes_as_text to get the output of .show()
  as a string.
* Add new errors.BzrRemoveChangedFilesError to raise when 'bzr remove'
  should refuse to delete stuff.
* Add workingtree.canicalpath(filename) to normalize file names.
* Changed the working of workingtree.remove(...) to check if any files
  are changed before it starts deleting anything. Will raise exception
  now if changed files are passed to be removed.
* workingtree_implementations/test_remove.py
  - Checked all tests and add more cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_remove.py
16
16
 
17
17
"""Tests for interface conformance of 'WorkingTree.remove'"""
18
18
 
 
19
import re
19
20
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
 
21
from bzrlib import errors, osutils
20
22
 
21
23
class TestRemove(TestCaseWithWorkingTree):
22
24
    """Tests WorkingTree.remove"""
23
25
 
24
26
    files=['a', 'b/', 'b/c']
 
27
    a = ['a']
25
28
    b = ['b']
26
29
    b_c = ['b', 'b/c']
27
30
 
31
34
        self.build_tree(TestRemove.files)
32
35
        return tree
33
36
 
 
37
    def test_remove_keep(self):
 
38
        """Check that files are unversioned but not deleted."""
 
39
        tree = self.getTree()
 
40
        tree.add(TestRemove.files)
 
41
        self.assertInWorkingTree(TestRemove.files)
 
42
 
 
43
        tree.remove(TestRemove.files)
 
44
        self.assertNotInWorkingTree(TestRemove.files)
 
45
        self.failUnlessExists(TestRemove.files)
 
46
 
34
47
    def test_remove_unchanged_files(self):
35
 
        """check that unchanged files are removed and deleted."""
 
48
        """Check that unchanged files are removed and deleted."""
36
49
        tree = self.getTree()
37
50
        tree.add(TestRemove.files)
38
51
        tree.commit("files must not have changes")
39
 
 
40
52
        self.assertInWorkingTree(TestRemove.files)
41
53
 
42
54
        tree.remove(TestRemove.files, keep_files=False)
44
56
        self.assertNotInWorkingTree(TestRemove.files)
45
57
        self.failIfExists(TestRemove.files)
46
58
 
47
 
    def test_remove_changed_files(self):
48
 
        """check that changed files are removed but not deleted."""
 
59
    def test_remove_added_files(self):
 
60
        """Removal of newly added files must fail."""
49
61
        tree = self.getTree()
50
62
        tree.add(TestRemove.files)
51
63
        self.assertInWorkingTree(TestRemove.files)
52
 
 
53
 
        tree.remove(TestRemove.files, keep_files=False)
54
 
 
55
 
        self.assertNotInWorkingTree(TestRemove.files)
 
64
        try:
 
65
            tree.remove(TestRemove.files, keep_files=False)
 
66
            self.fail('Should throw BzrRemoveChangedFilesError')
 
67
        except errors.BzrRemoveChangedFilesError, e:
 
68
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
 
69
                '.*added:.*a.*b.*b/c.*',
 
70
                str(e), re.DOTALL))
 
71
        self.assertInWorkingTree(TestRemove.files)
56
72
        self.failUnlessExists(TestRemove.files)
57
73
 
 
74
    def test_remove_changed_file(self):
 
75
        """Removal of a changed files must fail."""
 
76
        tree = self.getTree()
 
77
        tree.add(TestRemove.a)
 
78
        tree.commit("make sure a is versioned")
 
79
        f = file('a', 'wb')
 
80
        f.write("some other new content!")
 
81
        f.close()
 
82
        self.assertInWorkingTree(TestRemove.a)
 
83
        try:
 
84
            tree.remove(TestRemove.a, keep_files=False)
 
85
            self.fail('Should throw BzrRemoveChangedFilesError')
 
86
        except errors.BzrRemoveChangedFilesError, e:
 
87
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
 
88
                '.*modified:.*a.*',
 
89
                str(e), re.DOTALL))
 
90
        self.assertInWorkingTree(TestRemove.a)
 
91
        self.failUnlessExists(TestRemove.a)
 
92
 
 
93
    def test_remove_deleted_files(self):
 
94
        """Check that files are removed if they don't exist any more."""
 
95
        tree = self.getTree()
 
96
        tree.add(TestRemove.files)
 
97
        tree.commit("make sure files are versioned")
 
98
        for f in ['b/c','b','a']:
 
99
            osutils.delete_any(f)
 
100
        self.assertInWorkingTree(TestRemove.files)
 
101
        self.failIfExists(TestRemove.files)
 
102
 
 
103
        tree.remove(TestRemove.files, keep_files=False)
 
104
 
 
105
        self.assertNotInWorkingTree(TestRemove.files)
 
106
        self.failIfExists(TestRemove.files)
 
107
 
58
108
    def test_force_remove_changed_files(self):
59
 
        """check that changed files are removed and deleted when forced."""
 
109
        """Check that changed files are removed and deleted when forced."""
60
110
        tree = self.getTree()
61
111
        tree.add(TestRemove.files)
62
112
        self.assertInWorkingTree(TestRemove.files)
66
116
        self.assertNotInWorkingTree(TestRemove.files)
67
117
        self.failIfExists(TestRemove.files)
68
118
 
 
119
    def test_remove_unknown_files(self):
 
120
        """Try to delete unknown files."""
 
121
        tree = self.getTree()
 
122
        try:
 
123
            tree.remove(TestRemove.files, keep_files=False)
 
124
            self.fail('Should throw BzrRemoveChangedFilesError')
 
125
        except errors.BzrRemoveChangedFilesError, e:
 
126
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
 
127
                '.*unknown:.*b/c.*b.*a.*',
 
128
                str(e), re.DOTALL))
 
129
 
69
130
    def test_remove_nonexisting_files(self):
70
 
        """delete files which does not exist."""
 
131
        """Try to delete non-existing files."""
71
132
        tree = self.getTree()
72
 
        tree.remove(TestRemove.files, keep_files=False)
73
133
        tree.remove([''], keep_files=False)
74
 
        tree.remove(TestRemove.b, keep_files=False)
 
134
        try:
 
135
            tree.remove(['xyz', 'abc/def'], keep_files=False)
 
136
            self.fail('Should throw BzrRemoveChangedFilesError')
 
137
        except errors.BzrRemoveChangedFilesError, e:
 
138
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
 
139
                '.*unknown:.*xyz.*abc/def.*',
 
140
                str(e), re.DOTALL))
75
141
 
76
142
    def test_remove_nonempty_directory(self):
 
143
        """Unchanged non-empty directories should be deleted."""
77
144
        tree = self.getTree()
78
145
        tree.add(TestRemove.files)
79
146
        tree.commit("make sure b is versioned")
81
148
        self.failUnlessExists(TestRemove.files)
82
149
        tree.remove(TestRemove.b, keep_files=False)
83
150
        self.assertNotInWorkingTree(TestRemove.b)
 
151
        self.failIfExists(TestRemove.b)
 
152
        
 
153
    def test_remove_nonempty_directory_with_unknowns(self):
 
154
        """Unchanged non-empty directories should be deleted."""
 
155
        tree = self.getTree()
 
156
        tree.add(TestRemove.files)
 
157
        tree.commit("make sure b is versioned")
 
158
        self.assertInWorkingTree(TestRemove.files)
 
159
        self.failUnlessExists(TestRemove.files)
 
160
        f = file('b/my_unknown_file', 'wb')
 
161
        f.write("some content!")
 
162
        f.close()
 
163
        try:
 
164
            tree.remove(TestRemove.b, keep_files=False)
 
165
            self.fail('Should throw BzrRemoveChangedFilesError')
 
166
        except errors.BzrRemoveChangedFilesError, e:
 
167
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
 
168
                '.*unknown:.*b/my_unknown_file.*',
 
169
                str(e), re.DOTALL))
 
170
        self.assertInWorkingTree(TestRemove.b)
84
171
        self.failUnlessExists(TestRemove.b)
85
172
 
86
173
    def test_force_remove_nonempty_directory(self):
93
180
        self.assertNotInWorkingTree(TestRemove.b_c)
94
181
        self.failIfExists(TestRemove.b_c)
95
182
 
96
 
    def test_remove_keep(self):
97
 
        """check that files are unversioned but not delete."""
 
183
    def test_remove_directory_with_changed_file(self):
 
184
        """Refuse to delete directories with changed files."""
98
185
        tree = self.getTree()
99
 
        tree.add(TestRemove.files)
100
 
        self.assertInWorkingTree(TestRemove.files)
 
186
        tree.add(TestRemove.b_c)
 
187
        tree.commit("make sure b and c are versioned")
 
188
        f = file('b/c', 'wb')
 
189
        f.write("some other new content!")
 
190
        f.close()
 
191
        self.assertInWorkingTree(TestRemove.b_c)
 
192
        try:
 
193
            tree.remove(TestRemove.b, keep_files=False)
 
194
            self.fail('Should throw BzrRemoveChangedFilesError')
 
195
        except errors.BzrRemoveChangedFilesError, e:
 
196
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
 
197
                '.*modified:.*b/c.*',
 
198
                str(e), re.DOTALL))
 
199
        self.assertInWorkingTree(TestRemove.b_c)
 
200
        self.failUnlessExists(TestRemove.b_c)
101
201
 
102
 
        tree.remove(TestRemove.files)
103
 
        self.assertNotInWorkingTree(TestRemove.files)
104
 
        self.failUnlessExists(TestRemove.files)
 
202
        #see if we can force it now..
 
203
        tree.remove(TestRemove.b, keep_files=False, force=True)
 
204
        self.assertNotInWorkingTree(TestRemove.b_c)
 
205
        self.failIfExists(TestRemove.b_c)