|
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 |
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
7 |
from bzrlib.inventory import InventoryFile |
|
1092.1.26
by Robert Collins
start writing star-topology test, realise we need smart-add change |
8 |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
9 |
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 |
10 |
|
11 |
def test_add_dot_from_root(self): |
|
12 |
"""Test adding . from the root of the tree."""
|
|
13 |
from bzrlib.add import smart_add |
|
14 |
paths = ("original/", "original/file1", "original/file2") |
|
15 |
self.build_tree(paths) |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
16 |
branch = Branch.initialize(".") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
17 |
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 |
18 |
for path in paths: |
19 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
20 |
||
21 |
def test_add_dot_from_subdir(self): |
|
22 |
"""Test adding . from a subdir of the tree."""
|
|
23 |
from bzrlib.add import smart_add |
|
24 |
paths = ("original/", "original/file1", "original/file2") |
|
25 |
self.build_tree(paths) |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
26 |
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 |
27 |
os.chdir("original") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
28 |
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 |
29 |
for path in paths: |
30 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
31 |
||
32 |
def test_add_tree_from_above_tree(self): |
|
33 |
"""Test adding a tree from above the tree."""
|
|
34 |
from bzrlib.add import smart_add |
|
35 |
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 |
36 |
branch_paths = ("branch/", "branch/original/", "branch/original/file1", |
37 |
"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 |
38 |
self.build_tree(branch_paths) |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
39 |
branch = Branch.initialize("branch") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
40 |
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 |
41 |
for path in paths: |
42 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
43 |
||
44 |
def test_add_above_tree_preserves_tree(self): |
|
45 |
"""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 |
46 |
from bzrlib.add import smart_add, add_reporter_null |
47 |
||
|
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 |
48 |
paths = ("original/", "original/file1", "original/file2") |
|
1143
by Martin Pool
- remove dead code and remove some small errors (pychecker) |
49 |
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 |
50 |
full_child_paths = ("original/child", "original/child/path") |
51 |
build_paths = ("original/", "original/file1", "original/file2", |
|
52 |
"original/child/", "original/child/path") |
|
|
1143
by Martin Pool
- remove dead code and remove some small errors (pychecker) |
53 |
|
|
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 |
54 |
self.build_tree(build_paths) |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
55 |
branch = Branch.initialize(".") |
56 |
child_branch = Branch.initialize("original/child") |
|
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
57 |
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 |
58 |
for path in paths: |
59 |
self.assertNotEqual((path, branch.inventory.path2id(path)), |
|
60 |
(path, None)) |
|
61 |
for path in full_child_paths: |
|
62 |
self.assertEqual((path, branch.inventory.path2id(path)), |
|
63 |
(path, None)) |
|
64 |
for path in child_paths: |
|
65 |
self.assertEqual(child_branch.inventory.path2id(path), None) |
|
|
1092.1.28
by Robert Collins
test adding lists of paths |
66 |
|
67 |
def test_add_paths(self): |
|
68 |
"""Test smart-adding a list of paths."""
|
|
69 |
from bzrlib.add import smart_add |
|
70 |
paths = ("file1", "file2") |
|
71 |
self.build_tree(paths) |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
72 |
branch = Branch.initialize(".") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
73 |
smart_add(paths) |
|
1092.1.28
by Robert Collins
test adding lists of paths |
74 |
for path in paths: |
75 |
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 |
76 |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
77 |
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 |
78 |
"""Test smart adds with a specified branch."""
|
79 |
||
80 |
def test_add_dot_from_root(self): |
|
81 |
"""Test adding . from the root of the tree."""
|
|
82 |
from bzrlib.add import smart_add_branch |
|
83 |
paths = ("original/", "original/file1", "original/file2") |
|
84 |
self.build_tree(paths) |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
85 |
branch = Branch.initialize(".") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
86 |
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 |
87 |
for path in paths: |
88 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
89 |
||
90 |
def test_add_dot_from_subdir(self): |
|
91 |
"""Test adding . from a subdir of the tree."""
|
|
92 |
from bzrlib.add import smart_add_branch |
|
93 |
paths = ("original/", "original/file1", "original/file2") |
|
94 |
self.build_tree(paths) |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
95 |
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 |
96 |
os.chdir("original") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
97 |
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 |
98 |
for path in paths: |
99 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
100 |
||
101 |
def test_add_tree_from_above_tree(self): |
|
102 |
"""Test adding a tree from above the tree."""
|
|
103 |
from bzrlib.add import smart_add_branch |
|
104 |
paths = ("original/", "original/file1", "original/file2") |
|
105 |
branch_paths = ("branch/", "branch/original/", "branch/original/file1", |
|
106 |
"branch/original/file2") |
|
107 |
self.build_tree(branch_paths) |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
108 |
branch = Branch.initialize("branch") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
109 |
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 |
110 |
for path in paths: |
111 |
self.assertNotEqual(branch.inventory.path2id(path), None) |
|
112 |
||
113 |
def test_add_above_tree_preserves_tree(self): |
|
114 |
"""Test nested trees are not affect by an add above them."""
|
|
115 |
from bzrlib.add import smart_add_branch |
|
116 |
paths = ("original/", "original/file1", "original/file2") |
|
117 |
child_paths = ("path") |
|
118 |
full_child_paths = ("original/child", "original/child/path") |
|
119 |
build_paths = ("original/", "original/file1", "original/file2", |
|
120 |
"original/child/", "original/child/path") |
|
121 |
self.build_tree(build_paths) |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
122 |
branch = Branch.initialize(".") |
123 |
child_branch = Branch.initialize("original/child") |
|
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
124 |
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 |
125 |
for path in paths: |
126 |
self.assertNotEqual((path, branch.inventory.path2id(path)), |
|
127 |
(path, None)) |
|
128 |
for path in full_child_paths: |
|
129 |
self.assertEqual((path, branch.inventory.path2id(path)), |
|
130 |
(path, None)) |
|
131 |
for path in child_paths: |
|
132 |
self.assertEqual(child_branch.inventory.path2id(path), None) |
|
133 |
||
134 |
def test_add_paths(self): |
|
135 |
"""Test smart-adding a list of paths."""
|
|
136 |
from bzrlib.add import smart_add_branch |
|
137 |
paths = ("file1", "file2") |
|
138 |
self.build_tree(paths) |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
139 |
branch = Branch.initialize(".") |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
140 |
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 |
141 |
for path in paths: |
142 |
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 |
143 |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
144 |
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 |
145 |
|
146 |
def setUp(self): |
|
147 |
super(TestAddCallbacks, self).setUp() |
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
148 |
self.entry = InventoryFile("id", "name", 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 |
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") |