/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
743 by Martin Pool
- new simple versioning test cases
1
# Copyright (C) 2005 by Canonical Ltd
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
18
"""Tests of simple versioning operations"""
19
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
20
# TODO: test trying to commit within a directory that is not yet added
21
22
23
import os
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
24
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
25
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
26
from bzrlib.branch import Branch
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
27
from bzrlib.trace import mutter
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
28
743 by Martin Pool
- new simple versioning test cases
29
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
30
class TestVersioning(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
31
    
32
    def test_mkdir(self): 
744 by Martin Pool
- show nicer descriptions while running tests
33
        """Basic 'bzr mkdir' operation"""
743 by Martin Pool
- new simple versioning test cases
34
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
35
        self.run_bzr('init')
36
        self.run_bzr('mkdir', 'foo')
743 by Martin Pool
- new simple versioning test cases
37
        self.assert_(os.path.isdir('foo'))
38
1185.35.21 by Aaron Bentley
Changed error status to 3
39
        self.run_bzr('mkdir', 'foo', retcode=3)
749 by Martin Pool
- More tests for bzr mkdir
40
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
41
        from bzrlib.diff import compare_trees
749 by Martin Pool
- More tests for bzr mkdir
42
        from bzrlib.branch import Branch
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
43
        b = Branch.open('.')
749 by Martin Pool
- More tests for bzr mkdir
44
        
45
        delta = compare_trees(b.basis_tree(), b.working_tree())
46
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
47
        self.log('delta.added = %r' % delta.added)
48
749 by Martin Pool
- More tests for bzr mkdir
49
        self.assertEquals(len(delta.added), 1)
50
        self.assertEquals(delta.added[0][0], 'foo')
51
        self.failIf(delta.modified)
52
1185.31.7 by John Arbash Meinel
Applying Alexander Belchenko's patch to handle multiple mkdir calls
53
    def test_mkdir_in_subdir(self):
54
        """'bzr mkdir' operation in subdirectory"""
55
56
        self.run_bzr('init')
57
        self.run_bzr('mkdir', 'dir')
58
        self.assert_(os.path.isdir('dir'))
59
60
        os.chdir('dir')
61
        self.log('Run mkdir in subdir')
62
        self.run_bzr('mkdir', 'subdir')
63
        self.assert_(os.path.isdir('subdir'))
64
        os.chdir('..')
65
66
        from bzrlib.diff import compare_trees
67
        from bzrlib.branch import Branch
68
        b = Branch.open('.')
69
        
70
        delta = compare_trees(b.basis_tree(), b.working_tree())
71
72
        self.log('delta.added = %r' % delta.added)
73
74
        self.assertEquals(len(delta.added), 2)
75
        self.assertEquals(delta.added[0][0], 'dir')
76
        self.assertEquals(delta.added[1][0], os.path.join('dir','subdir'))
77
        self.failIf(delta.modified)
78
1185.31.8 by John Arbash Meinel
Modified mkdir functionality, to handle multiple nested trees.
79
    def test_mkdir_w_nested_trees(self):
80
        """'bzr mkdir' with nested trees"""
81
82
        self.run_bzr('init')
83
        os.mkdir('a')
84
        os.chdir('a')
85
        self.run_bzr('init')
86
        os.mkdir('b')
87
        os.chdir('b')
88
        self.run_bzr('init')
89
        os.chdir('../..')
90
91
        self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
92
        self.failUnless(os.path.isdir('dir'))
93
        self.failUnless(os.path.isdir('a/dir'))
94
        self.failUnless(os.path.isdir('a/b/dir'))
95
96
        from bzrlib.diff import compare_trees
97
        b = Branch.open('.')
98
        b_a = Branch.open('a')
99
        b_b = Branch.open('a/b')
100
        
101
        delta = compare_trees(b.basis_tree(), b.working_tree())
102
        self.assertEquals(len(delta.added), 1)
103
        self.assertEquals(delta.added[0][0], 'dir')
104
        self.failIf(delta.modified)
105
106
        delta = compare_trees(b_a.basis_tree(), b_a.working_tree())
107
        self.assertEquals(len(delta.added), 1)
108
        self.assertEquals(delta.added[0][0], 'dir')
109
        self.failIf(delta.modified)
110
111
        delta = compare_trees(b_b.basis_tree(), b_b.working_tree())
112
        self.assertEquals(len(delta.added), 1)
113
        self.assertEquals(delta.added[0][0], 'dir')
114
        self.failIf(delta.modified)
115
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
116
    def test_branch_add_in_unversioned(self):
754 by Martin Pool
- new check for attempting to add a file in an unversioned
117
        """Try to add a file in an unversioned directory.
118
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
119
        "bzr add" adds the parent as necessary, but simple branch add
120
        doesn't do that.
754 by Martin Pool
- new check for attempting to add a file in an unversioned
121
        """
122
        from bzrlib.branch import Branch
123
        from bzrlib.errors import NotVersionedError
124
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
125
        b = Branch.initialize('.')
754 by Martin Pool
- new check for attempting to add a file in an unversioned
126
127
        self.build_tree(['foo/',
128
                         'foo/hello'])
129
130
        self.assertRaises(NotVersionedError,
131
                          b.add,
132
                          'foo/hello')
133
        
1380 by Martin Pool
- upgrade can no longer be done in current version branches
134
        self.check_branch()
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
135
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
136
    def test_add_in_unversioned(self):
137
        """Try to add a file in an unversioned directory.
138
139
        "bzr add" should add the parent(s) as necessary.
140
        """
141
        from bzrlib.branch import Branch
142
        eq = self.assertEqual
143
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
144
        b = Branch.initialize('.')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
145
146
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
147
        eq(list(b.unknowns()), ['inertiatic'])
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
148
        self.run_bzr('add', 'inertiatic/esp')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
149
        eq(list(b.unknowns()), [])
150
151
        # Multiple unversioned parents
152
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
153
        eq(list(b.unknowns()), ['veil'])
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
154
        self.run_bzr('add', 'veil/cerpin/taxt')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
155
        eq(list(b.unknowns()), [])
156
157
        # Check whacky paths work
158
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
159
        eq(list(b.unknowns()), ['cicatriz'])
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
160
        self.run_bzr('add', 'inertiatic/../cicatriz/esp')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
161
        eq(list(b.unknowns()), [])
162
163
    def test_add_in_versioned(self):
164
        """Try to add a file in a versioned directory.
165
166
        "bzr add" should do this happily.
167
        """
168
        from bzrlib.branch import Branch
169
        eq = self.assertEqual
170
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
171
        b = Branch.initialize('.')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
172
173
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
174
        eq(list(b.unknowns()), ['inertiatic'])
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
175
        self.run_bzr('add', '--no-recurse', 'inertiatic')
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
176
        eq(list(b.unknowns()), ['inertiatic'+os.sep+'esp'])
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
177
        self.run_bzr('add', 'inertiatic/esp')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
178
        eq(list(b.unknowns()), [])
179
1102 by Martin Pool
- merge test refactoring from robertc
180
    def test_subdir_add(self):
181
        """Add in subdirectory should add only things from there down"""
182
        
183
        from bzrlib.branch import Branch
184
        
185
        eq = self.assertEqual
186
        ass = self.assert_
187
        chdir = os.chdir
188
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
189
        b = Branch.initialize('.')
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
190
        t = b.working_tree()
1102 by Martin Pool
- merge test refactoring from robertc
191
        self.build_tree(['src/', 'README'])
192
        
193
        eq(sorted(b.unknowns()),
194
           ['README', 'src'])
195
        
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
196
        self.run_bzr('add', 'src')
1102 by Martin Pool
- merge test refactoring from robertc
197
        
198
        self.build_tree(['src/foo.c'])
199
        
200
        chdir('src')
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
201
        self.run_bzr('add')
1102 by Martin Pool
- merge test refactoring from robertc
202
        
203
        eq(sorted(b.unknowns()), 
204
           ['README'])
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
205
        eq(len(t.read_working_inventory()), 3)
1102 by Martin Pool
- merge test refactoring from robertc
206
                
207
        chdir('..')
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
208
        self.run_bzr('add')
1102 by Martin Pool
- merge test refactoring from robertc
209
        eq(list(b.unknowns()), [])
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
210
1380 by Martin Pool
- upgrade can no longer be done in current version branches
211
        self.check_branch()
212
213
    def check_branch(self):
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
214
        """After all the above changes, run the check and upgrade commands.
215
216
        The upgrade should be a no-op."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
217
        b = Branch.open('.')
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
218
        mutter('branch has %d revisions', b.revno())
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
219
        
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
220
        mutter('check branch...')
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
221
        from bzrlib.check import check
1450 by Robert Collins
hah, missed tests in check changes
222
        check(b, False)
1506 by Robert Collins
Merge Johns current integration work.
223
224
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
225
class SubdirCommit(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
226
227
    def test_subdir_commit(self):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
228
        """Test committing a subdirectory, and committing within a directory."""
229
        run_bzr = self.run_bzr
230
        eq = self.assertEqual
231
232
        self.build_tree(['a/', 'b/'])
233
        
234
        run_bzr('init')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
235
        b = Branch.open('.')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
236
        
237
        for fn in ('a/one', 'b/two', 'top'):
238
            file(fn, 'w').write('old contents')
239
            
240
        run_bzr('add')
241
        run_bzr('commit', '-m', 'first revision')
242
        
243
        for fn in ('a/one', 'b/two', 'top'):
244
            file(fn, 'w').write('new contents')
245
            
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
246
        mutter('start selective subdir commit')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
247
        run_bzr('commit', 'a', '-m', 'commit a only')
248
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
249
        old = b.revision_tree(b.get_rev_id(1))
250
        new = b.revision_tree(b.get_rev_id(2))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
251
        
252
        eq(new.get_file_by_path('b/two').read(), 'old contents')
253
        eq(new.get_file_by_path('top').read(), 'old contents')
254
        eq(new.get_file_by_path('a/one').read(), 'new contents')
255
        
256
        os.chdir('a')
257
        # commit from here should do nothing
258
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
259
        v3 = b.revision_tree(b.get_rev_id(3))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
260
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
261
        eq(v3.get_file_by_path('top').read(), 'old contents')
262
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
263
                
264
        # commit in subdirectory commits whole tree
265
        run_bzr('commit', '-m', 'commit whole tree from subdir')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
266
        v4 = b.revision_tree(b.get_rev_id(4))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
267
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
268
        eq(v4.get_file_by_path('top').read(), 'new contents')
269
        
270
        # TODO: factor out some kind of assert_tree_state() method
271
        
1244 by Martin Pool
- let selftest/versioning run as standalone test
272
273
if __name__ == '__main__':
274
    import unittest
275
    unittest.main()
276