/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
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
25
from bzrlib.tests 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.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
43
        b = Branch.open(u'.')
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
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
68
        b = Branch.open(u'.')
1185.31.7 by John Arbash Meinel
Applying Alexander Belchenko's patch to handle multiple mkdir calls
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
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
97
        b = Branch.open(u'.')
1185.31.8 by John Arbash Meinel
Modified mkdir functionality, to handle multiple nested trees.
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
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
116
    def test_working_tree_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
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
119
        "bzr add" adds the parent as necessary, but simple working tree add
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
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
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
124
        from bzrlib.workingtree import WorkingTree
754 by Martin Pool
- new check for attempting to add a file in an unversioned
125
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
126
        b = Branch.initialize(u'.')
754 by Martin Pool
- new check for attempting to add a file in an unversioned
127
128
        self.build_tree(['foo/',
129
                         'foo/hello'])
130
131
        self.assertRaises(NotVersionedError,
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
132
                          WorkingTree(b.base, b).add,
754 by Martin Pool
- new check for attempting to add a file in an unversioned
133
                          'foo/hello')
134
        
1380 by Martin Pool
- upgrade can no longer be done in current version branches
135
        self.check_branch()
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
136
1380 by Martin Pool
- upgrade can no longer be done in current version branches
137
    def check_branch(self):
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
138
        """After all the above changes, run the check and upgrade commands.
139
140
        The upgrade should be a no-op."""
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
141
        b = Branch.open(u'.')
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
142
        mutter('branch has %d revisions', b.revno())
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
143
        
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
144
        mutter('check branch...')
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
145
        from bzrlib.check import check
1450 by Robert Collins
hah, missed tests in check changes
146
        check(b, False)
1506 by Robert Collins
Merge Johns current integration work.
147
148
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
149
class SubdirCommit(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
150
151
    def test_subdir_commit(self):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
152
        """Test committing a subdirectory, and committing within a directory."""
153
        run_bzr = self.run_bzr
154
        eq = self.assertEqual
155
156
        self.build_tree(['a/', 'b/'])
157
        
158
        run_bzr('init')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
159
        b = Branch.open(u'.')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
160
        
161
        for fn in ('a/one', 'b/two', 'top'):
162
            file(fn, 'w').write('old contents')
163
            
164
        run_bzr('add')
165
        run_bzr('commit', '-m', 'first revision')
166
        
167
        for fn in ('a/one', 'b/two', 'top'):
168
            file(fn, 'w').write('new contents')
169
            
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
170
        mutter('start selective subdir commit')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
171
        run_bzr('commit', 'a', '-m', 'commit a only')
172
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
173
        old = b.revision_tree(b.get_rev_id(1))
174
        new = b.revision_tree(b.get_rev_id(2))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
175
        
176
        eq(new.get_file_by_path('b/two').read(), 'old contents')
177
        eq(new.get_file_by_path('top').read(), 'old contents')
178
        eq(new.get_file_by_path('a/one').read(), 'new contents')
179
        
180
        os.chdir('a')
181
        # commit from here should do nothing
182
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
183
        v3 = b.revision_tree(b.get_rev_id(3))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
184
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
185
        eq(v3.get_file_by_path('top').read(), 'old contents')
186
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
187
                
188
        # commit in subdirectory commits whole tree
189
        run_bzr('commit', '-m', 'commit whole tree from subdir')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
190
        v4 = b.revision_tree(b.get_rev_id(4))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
191
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
192
        eq(v4.get_file_by_path('top').read(), 'new contents')
193
        
194
        # TODO: factor out some kind of assert_tree_state() method
195
        
1244 by Martin Pool
- let selftest/versioning run as standalone test
196
197
if __name__ == '__main__':
198
    import unittest
199
    unittest.main()
200