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  | 
||
| 
979
by Martin Pool
 - fix bugs and add tests for doing commit of selected directories  | 
20  | 
# TODO: test adding a file whose directory is not versioned
 | 
21  | 
# TODO: test trying to commit within a directory that is not yet added
 | 
|
22  | 
||
23  | 
||
24  | 
import os  | 
|
25  | 
from bzrlib.selftest import InTempDir, BzrTestBase  | 
|
26  | 
from bzrlib.branch import Branch  | 
|
27  | 
||
| 
743
by Martin Pool
 - new simple versioning test cases  | 
28  | 
|
| 
1092.1.15
by Robert Collins
 finish flushing runTest idiom  | 
29  | 
class TestVersioning(InTempDir):  | 
30  | 
||
31  | 
def test_mkdir(self):  | 
|
| 
744
by Martin Pool
 - show nicer descriptions while running tests  | 
32  | 
"""Basic 'bzr mkdir' operation"""  | 
| 
743
by Martin Pool
 - new simple versioning test cases  | 
33  | 
from bzrlib.commands import run_bzr  | 
34  | 
||
| 
974
by Martin Pool
 - start adding tests for commit in subdir  | 
35  | 
run_bzr(['init'])  | 
36  | 
run_bzr(['mkdir', 'foo'])  | 
|
| 
743
by Martin Pool
 - new simple versioning test cases  | 
37  | 
self.assert_(os.path.isdir('foo'))  | 
38  | 
||
| 
974
by Martin Pool
 - start adding tests for commit in subdir  | 
39  | 
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])  | 
| 
749
by Martin Pool
 - More tests for bzr mkdir  | 
40  | 
|
| 
1005
by Martin Pool
 - split TreeDelta and compare_trees out into new module bzrlib.delta  | 
41  | 
from bzrlib.diff import compare_trees  | 
| 
749
by Martin Pool
 - More tests for bzr mkdir  | 
42  | 
from bzrlib.branch import Branch  | 
43  | 
b = Branch('.')  | 
|
44  | 
||
45  | 
delta = compare_trees(b.basis_tree(), b.working_tree())  | 
|
46  | 
||
| 
1016
by Martin Pool
 - more log output from tests  | 
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  | 
||
| 
1092.1.15
by Robert Collins
 finish flushing runTest idiom  | 
53  | 
def test_add_in_unversioned(self):  | 
| 
754
by Martin Pool
 - new check for attempting to add a file in an unversioned  | 
54  | 
"""Try to add a file in an unversioned directory.  | 
55  | 
||
56  | 
        smart_add may eventually add the parent as necessary, but simple
 | 
|
57  | 
        branch add doesn't do that.
 | 
|
58  | 
        """
 | 
|
59  | 
from bzrlib.branch import Branch  | 
|
60  | 
from bzrlib.errors import NotVersionedError  | 
|
61  | 
||
62  | 
b = Branch('.', init=True)  | 
|
63  | 
||
64  | 
self.build_tree(['foo/',  | 
|
65  | 
'foo/hello'])  | 
|
66  | 
||
67  | 
self.assertRaises(NotVersionedError,  | 
|
68  | 
b.add,  | 
|
69  | 
'foo/hello')  | 
|
70  | 
||
| 
1092.1.15
by Robert Collins
 finish flushing runTest idiom  | 
71  | 
def test_subdir_add(self):  | 
72  | 
"""Add in subdirectory should add only things from there down"""  | 
|
73  | 
||
74  | 
from bzrlib.branch import Branch  | 
|
75  | 
from bzrlib.commands import run_bzr  | 
|
76  | 
||
77  | 
eq = self.assertEqual  | 
|
78  | 
ass = self.assert_  | 
|
79  | 
chdir = os.chdir  | 
|
80  | 
||
81  | 
b = Branch('.', init=True)  | 
|
82  | 
self.build_tree(['src/', 'README'])  | 
|
83  | 
||
84  | 
eq(sorted(b.unknowns()),  | 
|
85  | 
['README', 'src'])  | 
|
86  | 
||
87  | 
eq(run_bzr(['add', 'src']), 0)  | 
|
88  | 
||
89  | 
self.build_tree(['src/foo.c'])  | 
|
90  | 
||
91  | 
chdir('src')  | 
|
92  | 
eq(run_bzr(['add']), 0)  | 
|
93  | 
||
94  | 
eq(sorted(b.unknowns()),  | 
|
95  | 
['README'])  | 
|
96  | 
eq(len(b.inventory), 3)  | 
|
97  | 
||
98  | 
chdir('..')  | 
|
99  | 
eq(run_bzr(['add']), 0)  | 
|
100  | 
eq(list(b.unknowns()), [])  | 
|
101  | 
||
| 
974
by Martin Pool
 - start adding tests for commit in subdir  | 
102  | 
|
| 
979
by Martin Pool
 - fix bugs and add tests for doing commit of selected directories  | 
103  | 
class SubdirCommit(BzrTestBase):  | 
| 
1092.1.15
by Robert Collins
 finish flushing runTest idiom  | 
104  | 
|
105  | 
def test_subdir_commit(self):  | 
|
| 
979
by Martin Pool
 - fix bugs and add tests for doing commit of selected directories  | 
106  | 
"""Test committing a subdirectory, and committing within a directory."""  | 
107  | 
run_bzr = self.run_bzr  | 
|
108  | 
eq = self.assertEqual  | 
|
109  | 
||
110  | 
self.build_tree(['a/', 'b/'])  | 
|
111  | 
||
112  | 
run_bzr('init')  | 
|
113  | 
b = Branch('.')  | 
|
114  | 
||
115  | 
for fn in ('a/one', 'b/two', 'top'):  | 
|
116  | 
file(fn, 'w').write('old contents')  | 
|
117  | 
||
118  | 
run_bzr('add')  | 
|
119  | 
run_bzr('commit', '-m', 'first revision')  | 
|
120  | 
||
121  | 
for fn in ('a/one', 'b/two', 'top'):  | 
|
122  | 
file(fn, 'w').write('new contents')  | 
|
123  | 
||
124  | 
run_bzr('commit', 'a', '-m', 'commit a only')  | 
|
125  | 
||
126  | 
old = b.revision_tree(b.lookup_revision(1))  | 
|
127  | 
new = b.revision_tree(b.lookup_revision(2))  | 
|
128  | 
||
129  | 
eq(new.get_file_by_path('b/two').read(), 'old contents')  | 
|
130  | 
eq(new.get_file_by_path('top').read(), 'old contents')  | 
|
131  | 
eq(new.get_file_by_path('a/one').read(), 'new contents')  | 
|
132  | 
||
133  | 
os.chdir('a')  | 
|
134  | 
        # commit from here should do nothing
 | 
|
| 
980
by Martin Pool
 - bzr commit from subdirectory should commit the whole tree  | 
135  | 
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')  | 
| 
979
by Martin Pool
 - fix bugs and add tests for doing commit of selected directories  | 
136  | 
v3 = b.revision_tree(b.lookup_revision(3))  | 
137  | 
eq(v3.get_file_by_path('b/two').read(), 'old contents')  | 
|
138  | 
eq(v3.get_file_by_path('top').read(), 'old contents')  | 
|
139  | 
eq(v3.get_file_by_path('a/one').read(), 'new contents')  | 
|
140  | 
||
141  | 
        # commit in subdirectory commits whole tree
 | 
|
| 
980
by Martin Pool
 - bzr commit from subdirectory should commit the whole tree  | 
142  | 
run_bzr('commit', '-m', 'commit whole tree from subdir')  | 
| 
979
by Martin Pool
 - fix bugs and add tests for doing commit of selected directories  | 
143  | 
v4 = b.revision_tree(b.lookup_revision(4))  | 
144  | 
eq(v4.get_file_by_path('b/two').read(), 'new contents')  | 
|
145  | 
eq(v4.get_file_by_path('top').read(), 'new contents')  | 
|
146  | 
||
147  | 
        # TODO: factor out some kind of assert_tree_state() method
 | 
|
148  |