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.3.3
by Martin Pool
 - patch from mpe to automatically add parent directories  | 
56  | 
def test_branch_add_in_unversioned(self):  | 
| 
754
by Martin Pool
 - new check for attempting to add a file in an unversioned  | 
57  | 
"""Try to add a file in an unversioned directory.  | 
58  | 
||
| 
1185.3.3
by Martin Pool
 - patch from mpe to automatically add parent directories  | 
59  | 
        "bzr add" adds the parent as necessary, but simple branch add
 | 
60  | 
        doesn't do that.
 | 
|
| 
754
by Martin Pool
 - new check for attempting to add a file in an unversioned  | 
61  | 
        """
 | 
62  | 
from bzrlib.branch import Branch  | 
|
63  | 
from bzrlib.errors import NotVersionedError  | 
|
64  | 
||
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
65  | 
b = Branch.initialize('.')  | 
| 
754
by Martin Pool
 - new check for attempting to add a file in an unversioned  | 
66  | 
|
67  | 
self.build_tree(['foo/',  | 
|
68  | 
'foo/hello'])  | 
|
69  | 
||
70  | 
self.assertRaises(NotVersionedError,  | 
|
71  | 
b.add,  | 
|
72  | 
'foo/hello')  | 
|
73  | 
||
| 
1380
by Martin Pool
 - upgrade can no longer be done in current version branches  | 
74  | 
self.check_branch()  | 
| 
1125
by Martin Pool
 - test code exercises a successful check and null upgrade of a branch  | 
75  | 
|
| 
1185.3.3
by Martin Pool
 - patch from mpe to automatically add parent directories  | 
76  | 
def test_add_in_unversioned(self):  | 
77  | 
"""Try to add a file in an unversioned directory.  | 
|
78  | 
||
79  | 
        "bzr add" should add the parent(s) as necessary.
 | 
|
80  | 
        """
 | 
|
81  | 
from bzrlib.branch import Branch  | 
|
82  | 
eq = self.assertEqual  | 
|
83  | 
||
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
84  | 
b = Branch.initialize('.')  | 
| 
1185.3.3
by Martin Pool
 - patch from mpe to automatically add parent directories  | 
85  | 
|
86  | 
self.build_tree(['inertiatic/', 'inertiatic/esp'])  | 
|
87  | 
eq(list(b.unknowns()), ['inertiatic'])  | 
|
| 
1478
by Robert Collins
 convert versioning tests to use self.run_bzr, making the test suite quieter  | 
88  | 
self.run_bzr('add', 'inertiatic/esp')  | 
| 
1185.3.3
by Martin Pool
 - patch from mpe to automatically add parent directories  | 
89  | 
eq(list(b.unknowns()), [])  | 
90  | 
||
91  | 
        # Multiple unversioned parents
 | 
|
92  | 
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])  | 
|
93  | 
eq(list(b.unknowns()), ['veil'])  | 
|
| 
1478
by Robert Collins
 convert versioning tests to use self.run_bzr, making the test suite quieter  | 
94  | 
self.run_bzr('add', 'veil/cerpin/taxt')  | 
| 
1185.3.3
by Martin Pool
 - patch from mpe to automatically add parent directories  | 
95  | 
eq(list(b.unknowns()), [])  | 
96  | 
||
97  | 
        # Check whacky paths work
 | 
|
98  | 
self.build_tree(['cicatriz/', 'cicatriz/esp'])  | 
|
99  | 
eq(list(b.unknowns()), ['cicatriz'])  | 
|
| 
1478
by Robert Collins
 convert versioning tests to use self.run_bzr, making the test suite quieter  | 
100  | 
self.run_bzr('add', 'inertiatic/../cicatriz/esp')  | 
| 
1185.3.3
by Martin Pool
 - patch from mpe to automatically add parent directories  | 
101  | 
eq(list(b.unknowns()), [])  | 
102  | 
||
103  | 
def test_add_in_versioned(self):  | 
|
104  | 
"""Try to add a file in a versioned directory.  | 
|
105  | 
||
106  | 
        "bzr add" should do this happily.
 | 
|
107  | 
        """
 | 
|
108  | 
from bzrlib.branch import Branch  | 
|
109  | 
eq = self.assertEqual  | 
|
110  | 
||
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
111  | 
b = Branch.initialize('.')  | 
| 
1185.3.3
by Martin Pool
 - patch from mpe to automatically add parent directories  | 
112  | 
|
113  | 
self.build_tree(['inertiatic/', 'inertiatic/esp'])  | 
|
114  | 
eq(list(b.unknowns()), ['inertiatic'])  | 
|
| 
1478
by Robert Collins
 convert versioning tests to use self.run_bzr, making the test suite quieter  | 
115  | 
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  | 
116  | 
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  | 
117  | 
self.run_bzr('add', 'inertiatic/esp')  | 
| 
1185.3.3
by Martin Pool
 - patch from mpe to automatically add parent directories  | 
118  | 
eq(list(b.unknowns()), [])  | 
119  | 
||
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
120  | 
def test_subdir_add(self):  | 
121  | 
"""Add in subdirectory should add only things from there down"""  | 
|
122  | 
||
123  | 
from bzrlib.branch import Branch  | 
|
124  | 
||
125  | 
eq = self.assertEqual  | 
|
126  | 
ass = self.assert_  | 
|
127  | 
chdir = os.chdir  | 
|
128  | 
||
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
129  | 
b = Branch.initialize('.')  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
130  | 
t = b.working_tree()  | 
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
131  | 
self.build_tree(['src/', 'README'])  | 
132  | 
||
133  | 
eq(sorted(b.unknowns()),  | 
|
134  | 
['README', 'src'])  | 
|
135  | 
||
| 
1478
by Robert Collins
 convert versioning tests to use self.run_bzr, making the test suite quieter  | 
136  | 
self.run_bzr('add', 'src')  | 
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
137  | 
|
138  | 
self.build_tree(['src/foo.c'])  | 
|
139  | 
||
140  | 
chdir('src')  | 
|
| 
1478
by Robert Collins
 convert versioning tests to use self.run_bzr, making the test suite quieter  | 
141  | 
self.run_bzr('add')  | 
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
142  | 
|
143  | 
eq(sorted(b.unknowns()),  | 
|
144  | 
['README'])  | 
|
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
145  | 
eq(len(t.read_working_inventory()), 3)  | 
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
146  | 
|
147  | 
chdir('..')  | 
|
| 
1478
by Robert Collins
 convert versioning tests to use self.run_bzr, making the test suite quieter  | 
148  | 
self.run_bzr('add')  | 
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
149  | 
eq(list(b.unknowns()), [])  | 
| 
1125
by Martin Pool
 - test code exercises a successful check and null upgrade of a branch  | 
150  | 
|
| 
1380
by Martin Pool
 - upgrade can no longer be done in current version branches  | 
151  | 
self.check_branch()  | 
152  | 
||
153  | 
def check_branch(self):  | 
|
| 
1125
by Martin Pool
 - test code exercises a successful check and null upgrade of a branch  | 
154  | 
"""After all the above changes, run the check and upgrade commands.  | 
155  | 
||
156  | 
        The upgrade should be a no-op."""
 | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
157  | 
b = Branch.open('.')  | 
| 
1125
by Martin Pool
 - test code exercises a successful check and null upgrade of a branch  | 
158  | 
debug('branch has %d revisions', b.revno())  | 
159  | 
||
160  | 
debug('check branch...')  | 
|
161  | 
from bzrlib.check import check  | 
|
| 
1450
by Robert Collins
 hah, missed tests in check changes  | 
162  | 
check(b, False)  | 
| 
1125
by Martin Pool
 - test code exercises a successful check and null upgrade of a branch  | 
163  | 
|
164  | 
||
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
165  | 
|
| 
1141
by Martin Pool
 - rename FunctionalTest to TestCaseInTempDir  | 
166  | 
class SubdirCommit(TestCaseInTempDir):  | 
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
167  | 
|
168  | 
def test_subdir_commit(self):  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
169  | 
"""Test committing a subdirectory, and committing within a directory."""  | 
170  | 
run_bzr = self.run_bzr  | 
|
171  | 
eq = self.assertEqual  | 
|
172  | 
||
173  | 
self.build_tree(['a/', 'b/'])  | 
|
174  | 
||
175  | 
run_bzr('init')  | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
176  | 
b = Branch.open('.')  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
177  | 
|
178  | 
for fn in ('a/one', 'b/two', 'top'):  | 
|
179  | 
file(fn, 'w').write('old contents')  | 
|
180  | 
||
181  | 
run_bzr('add')  | 
|
182  | 
run_bzr('commit', '-m', 'first revision')  | 
|
183  | 
||
184  | 
for fn in ('a/one', 'b/two', 'top'):  | 
|
185  | 
file(fn, 'w').write('new contents')  | 
|
186  | 
||
| 
1249
by Martin Pool
 - improvements to weave commit [broken]  | 
187  | 
debug('start selective subdir commit')  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
188  | 
run_bzr('commit', 'a', '-m', 'commit a only')  | 
189  | 
||
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
190  | 
old = b.revision_tree(b.get_rev_id(1))  | 
191  | 
new = b.revision_tree(b.get_rev_id(2))  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
192  | 
|
193  | 
eq(new.get_file_by_path('b/two').read(), 'old contents')  | 
|
194  | 
eq(new.get_file_by_path('top').read(), 'old contents')  | 
|
195  | 
eq(new.get_file_by_path('a/one').read(), 'new contents')  | 
|
196  | 
||
197  | 
os.chdir('a')  | 
|
198  | 
        # commit from here should do nothing
 | 
|
199  | 
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')  | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
200  | 
v3 = b.revision_tree(b.get_rev_id(3))  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
201  | 
eq(v3.get_file_by_path('b/two').read(), 'old contents')  | 
202  | 
eq(v3.get_file_by_path('top').read(), 'old contents')  | 
|
203  | 
eq(v3.get_file_by_path('a/one').read(), 'new contents')  | 
|
204  | 
||
205  | 
        # commit in subdirectory commits whole tree
 | 
|
206  | 
run_bzr('commit', '-m', 'commit whole tree from subdir')  | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
207  | 
v4 = b.revision_tree(b.get_rev_id(4))  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
208  | 
eq(v4.get_file_by_path('b/two').read(), 'new contents')  | 
209  | 
eq(v4.get_file_by_path('top').read(), 'new contents')  | 
|
210  | 
||
211  | 
        # TODO: factor out some kind of assert_tree_state() method
 | 
|
212  | 
||
| 
1244
by Martin Pool
 - let selftest/versioning run as standalone test  | 
213  | 
|
214  | 
if __name__ == '__main__':  | 
|
215  | 
import unittest  | 
|
216  | 
unittest.main()  | 
|
217  |