/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
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
28
from bzrlib.osutils import pathjoin
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
29
743 by Martin Pool
- new simple versioning test cases
30
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
31
class TestVersioning(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
32
    
33
    def test_mkdir(self): 
744 by Martin Pool
- show nicer descriptions while running tests
34
        """Basic 'bzr mkdir' operation"""
743 by Martin Pool
- new simple versioning test cases
35
1478 by Robert Collins
convert versioning tests to use self.run_bzr, making the test suite quieter
36
        self.run_bzr('init')
37
        self.run_bzr('mkdir', 'foo')
743 by Martin Pool
- new simple versioning test cases
38
        self.assert_(os.path.isdir('foo'))
39
1185.35.21 by Aaron Bentley
Changed error status to 3
40
        self.run_bzr('mkdir', 'foo', retcode=3)
749 by Martin Pool
- More tests for bzr mkdir
41
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
42
        from bzrlib.diff import compare_trees
749 by Martin Pool
- More tests for bzr mkdir
43
        from bzrlib.branch import Branch
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
44
        b = Branch.open(u'.')
749 by Martin Pool
- More tests for bzr mkdir
45
        
46
        delta = compare_trees(b.basis_tree(), b.working_tree())
47
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
48
        self.log('delta.added = %r' % delta.added)
49
749 by Martin Pool
- More tests for bzr mkdir
50
        self.assertEquals(len(delta.added), 1)
51
        self.assertEquals(delta.added[0][0], 'foo')
52
        self.failIf(delta.modified)
53
1185.31.7 by John Arbash Meinel
Applying Alexander Belchenko's patch to handle multiple mkdir calls
54
    def test_mkdir_in_subdir(self):
55
        """'bzr mkdir' operation in subdirectory"""
56
57
        self.run_bzr('init')
58
        self.run_bzr('mkdir', 'dir')
59
        self.assert_(os.path.isdir('dir'))
60
61
        os.chdir('dir')
62
        self.log('Run mkdir in subdir')
63
        self.run_bzr('mkdir', 'subdir')
64
        self.assert_(os.path.isdir('subdir'))
65
        os.chdir('..')
66
67
        from bzrlib.diff import compare_trees
68
        from bzrlib.branch import Branch
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
69
        b = Branch.open(u'.')
1185.31.7 by John Arbash Meinel
Applying Alexander Belchenko's patch to handle multiple mkdir calls
70
        
71
        delta = compare_trees(b.basis_tree(), b.working_tree())
72
73
        self.log('delta.added = %r' % delta.added)
74
75
        self.assertEquals(len(delta.added), 2)
76
        self.assertEquals(delta.added[0][0], 'dir')
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
77
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
1185.31.7 by John Arbash Meinel
Applying Alexander Belchenko's patch to handle multiple mkdir calls
78
        self.failIf(delta.modified)
79
1185.31.8 by John Arbash Meinel
Modified mkdir functionality, to handle multiple nested trees.
80
    def test_mkdir_w_nested_trees(self):
81
        """'bzr mkdir' with nested trees"""
82
83
        self.run_bzr('init')
84
        os.mkdir('a')
85
        os.chdir('a')
86
        self.run_bzr('init')
87
        os.mkdir('b')
88
        os.chdir('b')
89
        self.run_bzr('init')
90
        os.chdir('../..')
91
92
        self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
93
        self.failUnless(os.path.isdir('dir'))
94
        self.failUnless(os.path.isdir('a/dir'))
95
        self.failUnless(os.path.isdir('a/b/dir'))
96
97
        from bzrlib.diff import compare_trees
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
98
        b = Branch.open(u'.')
1185.31.8 by John Arbash Meinel
Modified mkdir functionality, to handle multiple nested trees.
99
        b_a = Branch.open('a')
100
        b_b = Branch.open('a/b')
101
        
102
        delta = compare_trees(b.basis_tree(), b.working_tree())
103
        self.assertEquals(len(delta.added), 1)
104
        self.assertEquals(delta.added[0][0], 'dir')
105
        self.failIf(delta.modified)
106
107
        delta = compare_trees(b_a.basis_tree(), b_a.working_tree())
108
        self.assertEquals(len(delta.added), 1)
109
        self.assertEquals(delta.added[0][0], 'dir')
110
        self.failIf(delta.modified)
111
112
        delta = compare_trees(b_b.basis_tree(), b_b.working_tree())
113
        self.assertEquals(len(delta.added), 1)
114
        self.assertEquals(delta.added[0][0], 'dir')
115
        self.failIf(delta.modified)
116
1380 by Martin Pool
- upgrade can no longer be done in current version branches
117
    def check_branch(self):
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
118
        """After all the above changes, run the check and upgrade commands.
119
120
        The upgrade should be a no-op."""
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
121
        b = Branch.open(u'.')
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
122
        mutter('branch has %d revisions', b.revno())
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
123
        
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
124
        mutter('check branch...')
1125 by Martin Pool
- test code exercises a successful check and null upgrade of a branch
125
        from bzrlib.check import check
1450 by Robert Collins
hah, missed tests in check changes
126
        check(b, False)
1506 by Robert Collins
Merge Johns current integration work.
127
128
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
129
class SubdirCommit(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
130
131
    def test_subdir_commit(self):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
132
        """Test committing a subdirectory, and committing within a directory."""
133
        run_bzr = self.run_bzr
134
        eq = self.assertEqual
135
136
        self.build_tree(['a/', 'b/'])
137
        
138
        run_bzr('init')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
139
        b = Branch.open(u'.')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
140
        
141
        for fn in ('a/one', 'b/two', 'top'):
142
            file(fn, 'w').write('old contents')
143
            
144
        run_bzr('add')
145
        run_bzr('commit', '-m', 'first revision')
146
        
147
        for fn in ('a/one', 'b/two', 'top'):
148
            file(fn, 'w').write('new contents')
149
            
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
150
        mutter('start selective subdir commit')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
151
        run_bzr('commit', 'a', '-m', 'commit a only')
152
        
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
153
        old = b.repository.revision_tree(b.get_rev_id(1))
154
        new = b.repository.revision_tree(b.get_rev_id(2))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
155
        
156
        eq(new.get_file_by_path('b/two').read(), 'old contents')
157
        eq(new.get_file_by_path('top').read(), 'old contents')
158
        eq(new.get_file_by_path('a/one').read(), 'new contents')
159
        
160
        os.chdir('a')
161
        # commit from here should do nothing
162
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
163
        v3 = b.repository.revision_tree(b.get_rev_id(3))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
164
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
165
        eq(v3.get_file_by_path('top').read(), 'old contents')
166
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
167
                
168
        # commit in subdirectory commits whole tree
169
        run_bzr('commit', '-m', 'commit whole tree from subdir')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
170
        v4 = b.repository.revision_tree(b.get_rev_id(4))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
171
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
172
        eq(v4.get_file_by_path('top').read(), 'new contents')
173
        
174
        # TODO: factor out some kind of assert_tree_state() method
175
        
1244 by Martin Pool
- let selftest/versioning run as standalone test
176
177
if __name__ == '__main__':
178
    import unittest
179
    unittest.main()
180