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