/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
27
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
28
import logging
29
logger = logging.getLogger('bzr.test.versioning')
30
debug = logger.debug
31
743 by Martin Pool
- new simple versioning test cases
32
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
33
class TestVersioning(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
34
    
35
    def test_mkdir(self): 
744 by Martin Pool
- show nicer descriptions while running tests
36
        """Basic 'bzr mkdir' operation"""
743 by Martin Pool
- new simple versioning test cases
37
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
38
        self.run_bzr('init')
39
        self.run_bzr('mkdir', 'foo')
743 by Martin Pool
- new simple versioning test cases
40
        self.assert_(os.path.isdir('foo'))
41
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
42
        self.run_bzr('mkdir', 'foo', retcode=2)
749 by Martin Pool
- More tests for bzr mkdir
43
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
44
        from bzrlib.diff import compare_trees
749 by Martin Pool
- More tests for bzr mkdir
45
        from bzrlib.branch import Branch
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
46
        b = Branch.open('.')
749 by Martin Pool
- More tests for bzr mkdir
47
        
48
        delta = compare_trees(b.basis_tree(), b.working_tree())
49
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
50
        self.log('delta.added = %r' % delta.added)
51
749 by Martin Pool
- More tests for bzr mkdir
52
        self.assertEquals(len(delta.added), 1)
53
        self.assertEquals(delta.added[0][0], 'foo')
54
        self.failIf(delta.modified)
55
1185.31.7 by John Arbash Meinel
Applying Alexander Belchenko's patch to handle multiple mkdir calls
56
    def test_mkdir_in_subdir(self):
57
        """'bzr mkdir' operation in subdirectory"""
58
59
        self.run_bzr('init')
60
        self.run_bzr('mkdir', 'dir')
61
        self.assert_(os.path.isdir('dir'))
62
63
        os.chdir('dir')
64
        self.log('Run mkdir in subdir')
65
        self.run_bzr('mkdir', 'subdir')
66
        self.assert_(os.path.isdir('subdir'))
67
        os.chdir('..')
68
69
        from bzrlib.diff import compare_trees
70
        from bzrlib.branch import Branch
71
        b = Branch.open('.')
72
        
73
        delta = compare_trees(b.basis_tree(), b.working_tree())
74
75
        self.log('delta.added = %r' % delta.added)
76
77
        self.assertEquals(len(delta.added), 2)
78
        self.assertEquals(delta.added[0][0], 'dir')
79
        self.assertEquals(delta.added[1][0], os.path.join('dir','subdir'))
80
        self.failIf(delta.modified)
81
82
1185.31.8 by John Arbash Meinel
Modified mkdir functionality, to handle multiple nested trees.
83
    def test_mkdir_w_nested_trees(self):
84
        """'bzr mkdir' with nested trees"""
85
86
        self.run_bzr('init')
87
        os.mkdir('a')
88
        os.chdir('a')
89
        self.run_bzr('init')
90
        os.mkdir('b')
91
        os.chdir('b')
92
        self.run_bzr('init')
93
        os.chdir('../..')
94
95
        self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
96
        self.failUnless(os.path.isdir('dir'))
97
        self.failUnless(os.path.isdir('a/dir'))
98
        self.failUnless(os.path.isdir('a/b/dir'))
99
100
        from bzrlib.diff import compare_trees
101
        b = Branch.open('.')
102
        b_a = Branch.open('a')
103
        b_b = Branch.open('a/b')
104
        
105
        delta = compare_trees(b.basis_tree(), b.working_tree())
106
        self.assertEquals(len(delta.added), 1)
107
        self.assertEquals(delta.added[0][0], 'dir')
108
        self.failIf(delta.modified)
109
110
        delta = compare_trees(b_a.basis_tree(), b_a.working_tree())
111
        self.assertEquals(len(delta.added), 1)
112
        self.assertEquals(delta.added[0][0], 'dir')
113
        self.failIf(delta.modified)
114
115
        delta = compare_trees(b_b.basis_tree(), b_b.working_tree())
116
        self.assertEquals(len(delta.added), 1)
117
        self.assertEquals(delta.added[0][0], 'dir')
118
        self.failIf(delta.modified)
119
120
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
121
    def test_branch_add_in_unversioned(self):
754 by Martin Pool
- new check for attempting to add a file in an unversioned
122
        """Try to add a file in an unversioned directory.
123
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
124
        "bzr add" adds the parent as necessary, but simple branch add
125
        doesn't do that.
754 by Martin Pool
- new check for attempting to add a file in an unversioned
126
        """
127
        from bzrlib.branch import Branch
128
        from bzrlib.errors import NotVersionedError
129
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
130
        b = Branch.initialize('.')
754 by Martin Pool
- new check for attempting to add a file in an unversioned
131
132
        self.build_tree(['foo/',
133
                         'foo/hello'])
134
135
        self.assertRaises(NotVersionedError,
136
                          b.add,
137
                          'foo/hello')
138
        
1380 by Martin Pool
- upgrade can no longer be done in current version branches
139
        self.check_branch()
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
140
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
141
    def test_add_in_unversioned(self):
142
        """Try to add a file in an unversioned directory.
143
144
        "bzr add" should add the parent(s) as necessary.
145
        """
146
        from bzrlib.branch import Branch
147
        eq = self.assertEqual
148
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
149
        b = Branch.initialize('.')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
150
151
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
152
        eq(list(b.unknowns()), ['inertiatic'])
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
153
        self.run_bzr('add', 'inertiatic/esp')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
154
        eq(list(b.unknowns()), [])
155
156
        # Multiple unversioned parents
157
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
158
        eq(list(b.unknowns()), ['veil'])
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
159
        self.run_bzr('add', 'veil/cerpin/taxt')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
160
        eq(list(b.unknowns()), [])
161
162
        # Check whacky paths work
163
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
164
        eq(list(b.unknowns()), ['cicatriz'])
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
165
        self.run_bzr('add', 'inertiatic/../cicatriz/esp')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
166
        eq(list(b.unknowns()), [])
167
168
    def test_add_in_versioned(self):
169
        """Try to add a file in a versioned directory.
170
171
        "bzr add" should do this happily.
172
        """
173
        from bzrlib.branch import Branch
174
        eq = self.assertEqual
175
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
176
        b = Branch.initialize('.')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
177
178
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
179
        eq(list(b.unknowns()), ['inertiatic'])
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
180
        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
181
        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
182
        self.run_bzr('add', 'inertiatic/esp')
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
183
        eq(list(b.unknowns()), [])
184
1102 by Martin Pool
- merge test refactoring from robertc
185
    def test_subdir_add(self):
186
        """Add in subdirectory should add only things from there down"""
187
        
188
        from bzrlib.branch import Branch
189
        
190
        eq = self.assertEqual
191
        ass = self.assert_
192
        chdir = os.chdir
193
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
194
        b = Branch.initialize('.')
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
195
        t = b.working_tree()
1102 by Martin Pool
- merge test refactoring from robertc
196
        self.build_tree(['src/', 'README'])
197
        
198
        eq(sorted(b.unknowns()),
199
           ['README', 'src'])
200
        
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
201
        self.run_bzr('add', 'src')
1102 by Martin Pool
- merge test refactoring from robertc
202
        
203
        self.build_tree(['src/foo.c'])
204
        
205
        chdir('src')
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
206
        self.run_bzr('add')
1102 by Martin Pool
- merge test refactoring from robertc
207
        
208
        eq(sorted(b.unknowns()), 
209
           ['README'])
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
210
        eq(len(t.read_working_inventory()), 3)
1102 by Martin Pool
- merge test refactoring from robertc
211
                
212
        chdir('..')
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
213
        self.run_bzr('add')
1102 by Martin Pool
- merge test refactoring from robertc
214
        eq(list(b.unknowns()), [])
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
215
1380 by Martin Pool
- upgrade can no longer be done in current version branches
216
        self.check_branch()
217
218
    def check_branch(self):
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
219
        """After all the above changes, run the check and upgrade commands.
220
221
        The upgrade should be a no-op."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
222
        b = Branch.open('.')
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
223
        debug('branch has %d revisions', b.revno())
224
        
225
        debug('check branch...')
226
        from bzrlib.check import check
1450 by Robert Collins
hah, missed tests in check changes
227
        check(b, False)
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
228
        
229
1102 by Martin Pool
- merge test refactoring from robertc
230
        
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
231
class SubdirCommit(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
232
233
    def test_subdir_commit(self):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
234
        """Test committing a subdirectory, and committing within a directory."""
235
        run_bzr = self.run_bzr
236
        eq = self.assertEqual
237
238
        self.build_tree(['a/', 'b/'])
239
        
240
        run_bzr('init')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
241
        b = Branch.open('.')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
242
        
243
        for fn in ('a/one', 'b/two', 'top'):
244
            file(fn, 'w').write('old contents')
245
            
246
        run_bzr('add')
247
        run_bzr('commit', '-m', 'first revision')
248
        
249
        for fn in ('a/one', 'b/two', 'top'):
250
            file(fn, 'w').write('new contents')
251
            
1249 by Martin Pool
- improvements to weave commit [broken]
252
        debug('start selective subdir commit')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
253
        run_bzr('commit', 'a', '-m', 'commit a only')
254
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
255
        old = b.revision_tree(b.get_rev_id(1))
256
        new = b.revision_tree(b.get_rev_id(2))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
257
        
258
        eq(new.get_file_by_path('b/two').read(), 'old contents')
259
        eq(new.get_file_by_path('top').read(), 'old contents')
260
        eq(new.get_file_by_path('a/one').read(), 'new contents')
261
        
262
        os.chdir('a')
263
        # commit from here should do nothing
264
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
265
        v3 = b.revision_tree(b.get_rev_id(3))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
266
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
267
        eq(v3.get_file_by_path('top').read(), 'old contents')
268
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
269
                
270
        # commit in subdirectory commits whole tree
271
        run_bzr('commit', '-m', 'commit whole tree from subdir')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
272
        v4 = b.revision_tree(b.get_rev_id(4))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
273
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
274
        eq(v4.get_file_by_path('top').read(), 'new contents')
275
        
276
        # TODO: factor out some kind of assert_tree_state() method
277
        
1244 by Martin Pool
- let selftest/versioning run as standalone test
278
279
if __name__ == '__main__':
280
    import unittest
281
    unittest.main()
282