2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2006 Canonical Ltd
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
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
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
16 |
|
17 |
"""Test the executable bit under various working tree formats."""
|
|
18 |
||
19 |
import os |
|
20 |
||
2911.5.4
by John Arbash Meinel
Switch around to properly look up the executable bit in the basis. |
21 |
from bzrlib import ( |
22 |
osutils, |
|
23 |
)
|
|
1852.6.6
by Robert Collins
Finish updating iter_entries change to make all tests pass. |
24 |
from bzrlib.inventory import InventoryFile |
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
25 |
from bzrlib.transform import TreeTransform |
4523.1.4
by Martin Pool
Rename remaining *_implementations tests |
26 |
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree |
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
27 |
|
28 |
||
29 |
class TestExecutable(TestCaseWithWorkingTree): |
|
30 |
||
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
31 |
def setUp(self): |
32 |
super(TestExecutable, self).setUp() |
|
33 |
self.a_id = "a-20051208024829-849e76f7968d7a86" |
|
34 |
self.b_id = "b-20051208024829-849e76f7968d7a86" |
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
35 |
wt = self.make_branch_and_tree('b1') |
36 |
b = wt.branch |
|
37 |
tt = TreeTransform(wt) |
|
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
38 |
tt.new_file('a', tt.root, 'a test\n', self.a_id, True) |
39 |
tt.new_file('b', tt.root, 'b test\n', self.b_id, False) |
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
40 |
tt.apply() |
41 |
||
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
42 |
self.wt = wt |
43 |
||
44 |
def check_exist(self, tree): |
|
45 |
"""Just check that both files have the right executable bits set"""
|
|
2255.2.35
by Robert Collins
Remove inappropriate use of inventory in tree executability tests. The inventory is not the authoritative source of executability. |
46 |
tree.lock_read() |
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
47 |
self.failUnless(tree.is_executable(self.a_id), |
48 |
"'a' lost the execute bit") |
|
49 |
self.failIf(tree.is_executable(self.b_id), |
|
50 |
"'b' gained an execute bit") |
|
2255.2.35
by Robert Collins
Remove inappropriate use of inventory in tree executability tests. The inventory is not the authoritative source of executability. |
51 |
tree.unlock() |
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
52 |
|
53 |
def check_empty(self, tree, ignore_inv=False): |
|
54 |
"""Check that the files are truly missing
|
|
55 |
:param ignore_inv: If you just delete files from a working tree
|
|
56 |
the inventory still shows them, so don't assert that
|
|
57 |
the inventory is empty, just that the tree doesn't have them
|
|
58 |
"""
|
|
2255.2.36
by Robert Collins
Fix Dirstate unversioning of entries which are in a parent. |
59 |
tree.lock_read() |
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
60 |
if not ignore_inv: |
1852.6.6
by Robert Collins
Finish updating iter_entries change to make all tests pass. |
61 |
self.assertEqual( |
62 |
[('', tree.inventory.root)], |
|
63 |
list(tree.inventory.iter_entries())) |
|
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
64 |
self.failIf(tree.has_id(self.a_id)) |
65 |
self.failIf(tree.has_filename('a')) |
|
66 |
self.failIf(tree.has_id(self.b_id)) |
|
67 |
self.failIf(tree.has_filename('b')) |
|
2255.2.36
by Robert Collins
Fix Dirstate unversioning of entries which are in a parent. |
68 |
tree.unlock() |
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
69 |
|
70 |
def commit_and_branch(self): |
|
71 |
"""Commit the current tree, and create a second tree"""
|
|
72 |
self.wt.commit('adding a,b', rev_id='r1') |
|
73 |
# Now make sure that 'bzr branch' also preserves the
|
|
74 |
# executable bit
|
|
75 |
# TODO: Maybe this should be a blackbox test
|
|
76 |
dir2 = self.wt.branch.bzrdir.clone('b2', revision_id='r1') |
|
77 |
wt2 = dir2.open_workingtree() |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
78 |
self.assertEqual(['r1'], wt2.get_parent_ids()) |
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
79 |
self.assertEqual('r1', wt2.branch.last_revision()) |
80 |
return wt2 |
|
81 |
||
82 |
def test_01_is_executable(self): |
|
83 |
"""Make sure that the tree was created and has the executable bit set"""
|
|
84 |
self.check_exist(self.wt) |
|
85 |
||
86 |
def test_02_stays_executable(self): |
|
87 |
"""reopen the tree and ensure it stuck."""
|
|
88 |
self.wt = self.wt.bzrdir.open_workingtree() |
|
89 |
self.check_exist(self.wt) |
|
90 |
||
91 |
def test_03_after_commit(self): |
|
92 |
"""Commit the change, and check the history"""
|
|
93 |
self.wt.commit('adding a,b', rev_id='r1') |
|
94 |
||
95 |
rev_tree = self.wt.branch.repository.revision_tree('r1') |
|
96 |
self.check_exist(rev_tree) |
|
97 |
||
98 |
def test_04_after_removed(self): |
|
99 |
"""Make sure reverting removed files brings them back correctly"""
|
|
100 |
self.wt.commit('adding a,b', rev_id='r1') |
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
101 |
|
102 |
# Make sure the entries are gone
|
|
103 |
os.remove('b1/a') |
|
104 |
os.remove('b1/b') |
|
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
105 |
self.check_empty(self.wt, ignore_inv=True) |
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
106 |
|
107 |
# Make sure that revert is able to bring them back,
|
|
108 |
# and sets 'a' back to being executable
|
|
109 |
||
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
110 |
rev_tree = self.wt.branch.repository.revision_tree('r1') |
111 |
||
112 |
self.wt.revert(['a', 'b'], rev_tree, backups=False) |
|
113 |
self.check_exist(self.wt) |
|
114 |
||
115 |
def test_05_removed_and_committed(self): |
|
116 |
"""Check that reverting to an earlier commit restores them"""
|
|
117 |
self.wt.commit('adding a,b', rev_id='r1') |
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
118 |
|
119 |
# Now remove them again, and make sure that after a
|
|
120 |
# commit, they are still marked correctly
|
|
121 |
os.remove('b1/a') |
|
122 |
os.remove('b1/b') |
|
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
123 |
self.wt.commit('removed', rev_id='r2') |
124 |
||
125 |
self.check_empty(self.wt) |
|
126 |
||
127 |
rev_tree = self.wt.branch.repository.revision_tree('r1') |
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
128 |
# Now revert back to the previous commit
|
2748.3.2
by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified' |
129 |
self.wt.revert(old_tree=rev_tree, backups=False) |
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
130 |
|
131 |
self.check_exist(self.wt) |
|
132 |
||
133 |
def test_06_branch(self): |
|
134 |
"""branch b1=>b2 should preserve the executable bits"""
|
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
135 |
# TODO: Maybe this should be a blackbox test
|
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
136 |
wt2 = self.commit_and_branch() |
137 |
||
138 |
self.check_exist(wt2) |
|
139 |
||
140 |
def test_07_pull(self): |
|
141 |
"""Test that pull will handle bits correctly"""
|
|
142 |
wt2 = self.commit_and_branch() |
|
143 |
||
144 |
os.remove('b1/a') |
|
145 |
os.remove('b1/b') |
|
146 |
self.wt.commit('removed', rev_id='r2') |
|
147 |
||
148 |
# now wt2 can pull and the files should be removed
|
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
149 |
|
150 |
# Make sure pull will delete the files
|
|
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
151 |
wt2.pull(self.wt.branch) |
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
152 |
self.assertEquals(['r2'], wt2.get_parent_ids()) |
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
153 |
self.assertEquals('r2', wt2.branch.last_revision()) |
154 |
self.check_empty(wt2) |
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
155 |
|
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
156 |
# Now restore the files on the first branch and commit
|
1711.4.30
by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins) |
157 |
# so that the second branch can pull the changes
|
158 |
# and make sure that the executable bit has been copied
|
|
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
159 |
rev_tree = self.wt.branch.repository.revision_tree('r1') |
2748.3.2
by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified' |
160 |
self.wt.revert(old_tree=rev_tree, backups=False) |
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
161 |
self.wt.commit('resurrected', rev_id='r3') |
162 |
||
163 |
self.check_exist(self.wt) |
|
164 |
||
165 |
wt2.pull(self.wt.branch) |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
166 |
self.assertEquals(['r3'], wt2.get_parent_ids()) |
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
167 |
self.assertEquals('r3', wt2.branch.last_revision()) |
168 |
self.check_exist(wt2) |
|
169 |
||
170 |
def test_08_no_op_revert(self): |
|
171 |
"""Just do a simple revert without anything changed
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
172 |
|
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
173 |
The bits shouldn't swap.
|
174 |
"""
|
|
175 |
self.wt.commit('adding a,b', rev_id='r1') |
|
176 |
rev_tree = self.wt.branch.repository.revision_tree('r1') |
|
2748.3.2
by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified' |
177 |
self.wt.revert(old_tree=rev_tree, backups=False) |
1711.4.33
by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones. |
178 |
self.check_exist(self.wt) |
179 |
||
2911.5.4
by John Arbash Meinel
Switch around to properly look up the executable bit in the basis. |
180 |
def test_commit_with_exec_from_basis(self): |
181 |
self.wt._is_executable_from_path_and_stat = \ |
|
182 |
self.wt._is_executable_from_path_and_stat_from_basis |
|
183 |
rev_id1 = self.wt.commit('one') |
|
184 |
rev_tree1 = self.wt.branch.repository.revision_tree(rev_id1) |
|
185 |
a_executable = rev_tree1.inventory[self.a_id].executable |
|
186 |
b_executable = rev_tree1.inventory[self.b_id].executable |
|
187 |
self.assertIsNot(None, a_executable) |
|
188 |
self.assertTrue(a_executable) |
|
189 |
self.assertIsNot(None, b_executable) |
|
190 |
self.assertFalse(b_executable) |
|
191 |
||
192 |
def test_use_exec_from_basis(self): |
|
193 |
if osutils.supports_executable(): |
|
194 |
self.assertEqual(self.wt._is_executable_from_path_and_stat_from_stat, |
|
195 |
self.wt._is_executable_from_path_and_stat) |
|
196 |
else: |
|
197 |
self.assertEqual(self.wt._is_executable_from_path_and_stat_from_basis, |
|
198 |
self.wt._is_executable_from_path_and_stat) |