|
1092.1.26
by Robert Collins
start writing star-topology test, realise we need smart-add change |
1 |
import os |
2 |
import unittest |
|
3 |
||
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
4 |
from bzrlib.selftest import TestCaseInTempDir, TestCase |
|
1092.1.26
by Robert Collins
start writing star-topology test, realise we need smart-add change |
5 |
from bzrlib.branch import Branch |
6 |
from bzrlib.errors import NotBranchError, NotVersionedError |
|
7 |
||
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
8 |
class TestSmartAdd(TestCaseInTempDir): |
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
9 |
|
10 |
def test_add_dot_from_root(self): |
|
11 |
"""Test adding . from the root of the tree."""
|
|
12 |
from bzrlib.add import smart_add |
|
13 |
paths = ("original/", "original/file1", "original/file2") |
|
14 |
self.build_tree(paths) |
|
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
15 |
branch = Branch.initialize(".") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
16 |
smart_add((".",), recurse=True) |
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
17 |
for path in paths: |
18 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
19 |
||
20 |
def test_add_dot_from_subdir(self): |
|
21 |
"""Test adding . from a subdir of the tree."""
|
|
22 |
from bzrlib.add import smart_add |
|
23 |
paths = ("original/", "original/file1", "original/file2") |
|
24 |
self.build_tree(paths) |
|
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
25 |
branch = Branch.initialize(".") |
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
26 |
os.chdir("original") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
27 |
smart_add((".",), recurse=True) |
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
28 |
for path in paths: |
29 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
30 |
||
31 |
def test_add_tree_from_above_tree(self): |
|
32 |
"""Test adding a tree from above the tree."""
|
|
33 |
from bzrlib.add import smart_add |
|
34 |
paths = ("original/", "original/file1", "original/file2") |
|
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
35 |
branch_paths = ("branch/", "branch/original/", "branch/original/file1", |
36 |
"branch/original/file2") |
|
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
37 |
self.build_tree(branch_paths) |
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
38 |
branch = Branch.initialize("branch") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
39 |
smart_add(("branch",)) |
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
40 |
for path in paths: |
41 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
42 |
||
43 |
def test_add_above_tree_preserves_tree(self): |
|
44 |
"""Test nested trees are not affect by an add above them."""
|
|
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
45 |
from bzrlib.add import smart_add, add_reporter_null |
46 |
||
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
47 |
paths = ("original/", "original/file1", "original/file2") |
|
1143
by Martin Pool
- remove dead code and remove some small errors (pychecker) |
48 |
child_paths = ("path",) |
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
49 |
full_child_paths = ("original/child", "original/child/path") |
50 |
build_paths = ("original/", "original/file1", "original/file2", |
|
51 |
"original/child/", "original/child/path") |
|
|
1143
by Martin Pool
- remove dead code and remove some small errors (pychecker) |
52 |
|
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
53 |
self.build_tree(build_paths) |
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
54 |
branch = Branch.initialize(".") |
55 |
child_branch = Branch.initialize("original/child") |
|
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
56 |
smart_add((".",), True, add_reporter_null) |
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
57 |
for path in paths: |
58 |
self.assertNotEqual((path, branch.inventory.path2id(path)), |
|
59 |
(path, None)) |
|
60 |
for path in full_child_paths: |
|
61 |
self.assertEqual((path, branch.inventory.path2id(path)), |
|
62 |
(path, None)) |
|
63 |
for path in child_paths: |
|
64 |
self.assertEqual(child_branch.inventory.path2id(path), None) |
|
|
1092.1.28
by Robert Collins
test adding lists of paths |
65 |
|
66 |
def test_add_paths(self): |
|
67 |
"""Test smart-adding a list of paths."""
|
|
68 |
from bzrlib.add import smart_add |
|
69 |
paths = ("file1", "file2") |
|
70 |
self.build_tree(paths) |
|
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
71 |
branch = Branch.initialize(".") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
72 |
smart_add(paths) |
|
1092.1.28
by Robert Collins
test adding lists of paths |
73 |
for path in paths: |
74 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
75 |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
76 |
class TestSmartAddBranch(TestCaseInTempDir): |
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
77 |
"""Test smart adds with a specified branch."""
|
78 |
||
79 |
def test_add_dot_from_root(self): |
|
80 |
"""Test adding . from the root of the tree."""
|
|
81 |
from bzrlib.add import smart_add_branch |
|
82 |
paths = ("original/", "original/file1", "original/file2") |
|
83 |
self.build_tree(paths) |
|
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
84 |
branch = Branch.initialize(".") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
85 |
smart_add_branch(branch, (".",)) |
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
86 |
for path in paths: |
87 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
88 |
||
89 |
def test_add_dot_from_subdir(self): |
|
90 |
"""Test adding . from a subdir of the tree."""
|
|
91 |
from bzrlib.add import smart_add_branch |
|
92 |
paths = ("original/", "original/file1", "original/file2") |
|
93 |
self.build_tree(paths) |
|
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
94 |
branch = Branch.initialize(".") |
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
95 |
os.chdir("original") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
96 |
smart_add_branch(branch, (".",)) |
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
97 |
for path in paths: |
98 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
99 |
||
100 |
def test_add_tree_from_above_tree(self): |
|
101 |
"""Test adding a tree from above the tree."""
|
|
102 |
from bzrlib.add import smart_add_branch |
|
103 |
paths = ("original/", "original/file1", "original/file2") |
|
104 |
branch_paths = ("branch/", "branch/original/", "branch/original/file1", |
|
105 |
"branch/original/file2") |
|
106 |
self.build_tree(branch_paths) |
|
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
107 |
branch = Branch.initialize("branch") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
108 |
smart_add_branch(branch, ("branch",)) |
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
109 |
for path in paths: |
110 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
111 |
||
112 |
def test_add_above_tree_preserves_tree(self): |
|
113 |
"""Test nested trees are not affect by an add above them."""
|
|
114 |
from bzrlib.add import smart_add_branch |
|
115 |
paths = ("original/", "original/file1", "original/file2") |
|
116 |
child_paths = ("path") |
|
117 |
full_child_paths = ("original/child", "original/child/path") |
|
118 |
build_paths = ("original/", "original/file1", "original/file2", |
|
119 |
"original/child/", "original/child/path") |
|
120 |
self.build_tree(build_paths) |
|
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
121 |
branch = Branch.initialize(".") |
122 |
child_branch = Branch.initialize("original/child") |
|
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
123 |
smart_add_branch(branch, (".",)) |
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
124 |
for path in paths: |
125 |
self.assertNotEqual((path, branch.inventory.path2id(path)), |
|
126 |
(path, None)) |
|
127 |
for path in full_child_paths: |
|
128 |
self.assertEqual((path, branch.inventory.path2id(path)), |
|
129 |
(path, None)) |
|
130 |
for path in child_paths: |
|
131 |
self.assertEqual(child_branch.inventory.path2id(path), None) |
|
132 |
||
133 |
def test_add_paths(self): |
|
134 |
"""Test smart-adding a list of paths."""
|
|
135 |
from bzrlib.add import smart_add_branch |
|
136 |
paths = ("file1", "file2") |
|
137 |
self.build_tree(paths) |
|
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
138 |
branch = Branch.initialize(".") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
139 |
smart_add_branch(branch, paths) |
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
140 |
for path in paths: |
141 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
142 |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
143 |
class TestAddCallbacks(TestCaseInTempDir): |
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
144 |
|
145 |
def setUp(self): |
|
146 |
from bzrlib.inventory import InventoryEntry |
|
147 |
super(TestAddCallbacks, self).setUp() |
|
148 |
self.entry = InventoryEntry("id", "name", "file", None) |
|
149 |
||
150 |
def test_null_callback(self): |
|
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
151 |
from bzrlib.add import add_reporter_null |
152 |
add_reporter_null('path', 'file', self.entry) |
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
153 |
|
154 |
def test_print_callback(self): |
|
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
155 |
from bzrlib.add import add_reporter_print |
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
156 |
from StringIO import StringIO |
157 |
stdout = StringIO() |
|
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
158 |
self.apply_redirected(None, stdout, None, add_reporter_print, |
|
1139
by Martin Pool
- merge in merge improvements and additional tests |
159 |
'path', 'file', self.entry) |
160 |
self.assertEqual(stdout.getvalue(), "added path\n") |