bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2005, 2006 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1185.67.4
by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1185.67.4
by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1185.67.4
by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock |
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 |
||
1185.70.2
by Martin Pool
Fix funny mistake |
17 |
from StringIO import StringIO |
18 |
||
1687.1.6
by Robert Collins
Extend LockableFiles to support break_lock() calls. |
19 |
import bzrlib |
20 |
import bzrlib.errors as errors |
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
21 |
from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError |
1553.5.63
by Martin Pool
Lock type is now mandatory for LockableFiles constructor |
22 |
from bzrlib.lockable_files import LockableFiles, TransportLock |
1553.5.44
by Martin Pool
LockableFiles can now call LockDir directly |
23 |
from bzrlib.lockdir import LockDir |
1185.67.4
by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock |
24 |
from bzrlib.tests import TestCaseInTempDir |
1594.2.22
by Robert Collins
Ensure that lockable files calls finish() on transactions.: |
25 |
from bzrlib.tests.test_transactions import DummyWeave |
1563.2.34
by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction |
26 |
from bzrlib.transactions import (PassThroughTransaction, |
27 |
ReadOnlyTransaction, |
|
28 |
WriteTransaction, |
|
29 |
)
|
|
1185.67.4
by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock |
30 |
from bzrlib.transport import get_transport |
1185.65.23
by Robert Collins
update tests somewhat |
31 |
|
1553.5.42
by Martin Pool
Start to parameterize LockableFiles test cases. |
32 |
|
33 |
# these tests are applied in each parameterized suite for LockableFiles
|
|
34 |
class _TestLockableFiles_mixin(object): |
|
1185.67.4
by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock |
35 |
|
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
36 |
def test_read_write(self): |
1185.65.29
by Robert Collins
Implement final review suggestions. |
37 |
self.assertRaises(NoSuchFile, self.lockable.get, 'foo') |
38 |
self.assertRaises(NoSuchFile, self.lockable.get_utf8, 'foo') |
|
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
39 |
self.lockable.lock_write() |
40 |
try: |
|
41 |
unicode_string = u'bar\u1234' |
|
42 |
self.assertEqual(4, len(unicode_string)) |
|
43 |
byte_string = unicode_string.encode('utf-8') |
|
44 |
self.assertEqual(6, len(byte_string)) |
|
45 |
self.assertRaises(UnicodeEncodeError, self.lockable.put, 'foo', |
|
46 |
StringIO(unicode_string)) |
|
47 |
self.lockable.put('foo', StringIO(byte_string)) |
|
48 |
self.assertEqual(byte_string, |
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
49 |
self.lockable.get('foo').read()) |
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
50 |
self.assertEqual(unicode_string, |
1185.65.29
by Robert Collins
Implement final review suggestions. |
51 |
self.lockable.get_utf8('foo').read()) |
52 |
self.assertRaises(BzrBadParameterNotString, |
|
53 |
self.lockable.put_utf8, |
|
54 |
'bar', |
|
55 |
StringIO(unicode_string) |
|
56 |
)
|
|
57 |
self.lockable.put_utf8('bar', unicode_string) |
|
2249.5.11
by John Arbash Meinel
Audit Branch to ensure utf8 revision ids. |
58 |
self.assertEqual(unicode_string, |
1185.65.29
by Robert Collins
Implement final review suggestions. |
59 |
self.lockable.get_utf8('bar').read()) |
2249.5.11
by John Arbash Meinel
Audit Branch to ensure utf8 revision ids. |
60 |
self.assertEqual(byte_string, |
1185.65.29
by Robert Collins
Implement final review suggestions. |
61 |
self.lockable.get('bar').read()) |
2249.5.11
by John Arbash Meinel
Audit Branch to ensure utf8 revision ids. |
62 |
self.lockable.put_bytes('raw', 'raw\xffbytes') |
63 |
self.assertEqual('raw\xffbytes', |
|
64 |
self.lockable.get('raw').read()) |
|
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
65 |
finally: |
66 |
self.lockable.unlock() |
|
67 |
||
1185.67.4
by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock |
68 |
def test_locks(self): |
1185.67.8
by Aaron Bentley
Test and fix read locks |
69 |
self.lockable.lock_read() |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
70 |
try: |
71 |
self.assertRaises(ReadOnlyError, self.lockable.put, 'foo', |
|
72 |
StringIO('bar\u1234')) |
|
73 |
finally: |
|
74 |
self.lockable.unlock() |
|
1185.68.1
by Aaron Bentley
test transactions |
75 |
|
76 |
def test_transactions(self): |
|
77 |
self.assertIs(self.lockable.get_transaction().__class__, |
|
78 |
PassThroughTransaction) |
|
79 |
self.lockable.lock_read() |
|
80 |
try: |
|
81 |
self.assertIs(self.lockable.get_transaction().__class__, |
|
82 |
ReadOnlyTransaction) |
|
83 |
finally: |
|
84 |
self.lockable.unlock() |
|
85 |
self.assertIs(self.lockable.get_transaction().__class__, |
|
86 |
PassThroughTransaction) |
|
87 |
self.lockable.lock_write() |
|
88 |
self.assertIs(self.lockable.get_transaction().__class__, |
|
1563.2.34
by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction |
89 |
WriteTransaction) |
1594.2.22
by Robert Collins
Ensure that lockable files calls finish() on transactions.: |
90 |
# check that finish is called:
|
91 |
vf = DummyWeave('a') |
|
92 |
self.lockable.get_transaction().register_dirty(vf) |
|
1185.68.1
by Aaron Bentley
test transactions |
93 |
self.lockable.unlock() |
1594.2.22
by Robert Collins
Ensure that lockable files calls finish() on transactions.: |
94 |
self.assertTrue(vf.finished) |
1185.65.23
by Robert Collins
update tests somewhat |
95 |
|
96 |
def test__escape(self): |
|
97 |
self.assertEqual('%25', self.lockable._escape('%')) |
|
98 |
||
99 |
def test__escape_empty(self): |
|
100 |
self.assertEqual('', self.lockable._escape('')) |
|
101 |
||
1687.1.6
by Robert Collins
Extend LockableFiles to support break_lock() calls. |
102 |
def test_break_lock(self): |
103 |
# some locks are not breakable
|
|
104 |
self.lockable.lock_write() |
|
105 |
try: |
|
106 |
self.assertRaises(AssertionError, self.lockable.break_lock) |
|
107 |
except NotImplementedError: |
|
108 |
# this lock cannot be broken
|
|
109 |
self.lockable.unlock() |
|
110 |
return
|
|
111 |
l2 = self.get_lockable() |
|
112 |
orig_factory = bzrlib.ui.ui_factory |
|
113 |
# silent ui - no need for stdout
|
|
114 |
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory() |
|
115 |
bzrlib.ui.ui_factory.stdin = StringIO("y\n") |
|
116 |
try: |
|
117 |
l2.break_lock() |
|
118 |
finally: |
|
119 |
bzrlib.ui.ui_factory = orig_factory |
|
120 |
try: |
|
121 |
l2.lock_write() |
|
122 |
l2.unlock() |
|
123 |
finally: |
|
124 |
self.assertRaises(errors.LockBroken, self.lockable.unlock) |
|
125 |
self.assertFalse(self.lockable.is_locked()) |
|
126 |
||
2279.7.1
by Andrew Bennetts
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that |
127 |
def test_lock_write_returns_None_refuses_token(self): |
128 |
token = self.lockable.lock_write() |
|
129 |
try: |
|
130 |
if token is not None: |
|
131 |
# This test does not apply, because this lockable supports
|
|
132 |
# tokens.
|
|
133 |
return
|
|
134 |
self.assertRaises(errors.TokenLockingNotSupported, |
|
135 |
self.lockable.lock_write, token='token') |
|
136 |
finally: |
|
137 |
self.lockable.unlock() |
|
138 |
||
2279.7.7
by Andrew Bennetts
LockDir, Repository and Branch lock token changes from the hpss branch. |
139 |
def test_lock_write_returns_token_when_given_token(self): |
140 |
token = self.lockable.lock_write() |
|
141 |
try: |
|
142 |
if token is None: |
|
143 |
# This test does not apply, because this lockable refuses
|
|
144 |
# tokens.
|
|
145 |
return
|
|
146 |
new_lockable = self.get_lockable() |
|
147 |
token_from_new_lockable = new_lockable.lock_write(token=token) |
|
148 |
try: |
|
149 |
self.assertEqual(token, token_from_new_lockable) |
|
150 |
finally: |
|
151 |
new_lockable.unlock() |
|
152 |
finally: |
|
153 |
self.lockable.unlock() |
|
154 |
||
2279.7.1
by Andrew Bennetts
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that |
155 |
def test_lock_write_raises_on_token_mismatch(self): |
156 |
token = self.lockable.lock_write() |
|
157 |
try: |
|
158 |
if token is None: |
|
159 |
# This test does not apply, because this lockable refuses
|
|
160 |
# tokens.
|
|
161 |
return
|
|
162 |
different_token = token + 'xxx' |
|
163 |
# Re-using the same lockable instance with a different token will
|
|
164 |
# raise TokenMismatch.
|
|
165 |
self.assertRaises(errors.TokenMismatch, |
|
166 |
self.lockable.lock_write, token=different_token) |
|
167 |
# A seperate instance for the same lockable will also raise
|
|
168 |
# TokenMismatch.
|
|
169 |
# This detects the case where a caller claims to have a lock (via
|
|
170 |
# the token) for an external resource, but doesn't (the token is
|
|
171 |
# different). Clients need a seperate lock object to make sure the
|
|
172 |
# external resource is probed, whereas the existing lock object
|
|
173 |
# might cache.
|
|
174 |
new_lockable = self.get_lockable() |
|
175 |
self.assertRaises(errors.TokenMismatch, |
|
176 |
new_lockable.lock_write, token=different_token) |
|
177 |
finally: |
|
178 |
self.lockable.unlock() |
|
179 |
||
180 |
def test_lock_write_with_matching_token(self): |
|
181 |
# If the token matches, so no exception is raised by lock_write.
|
|
182 |
token = self.lockable.lock_write() |
|
183 |
try: |
|
184 |
if token is None: |
|
185 |
# This test does not apply, because this lockable refuses
|
|
186 |
# tokens.
|
|
187 |
return
|
|
188 |
# The same instance will accept a second lock_write if the specified
|
|
189 |
# token matches.
|
|
190 |
self.lockable.lock_write(token=token) |
|
191 |
self.lockable.unlock() |
|
192 |
# Calling lock_write on a new instance for the same lockable will
|
|
193 |
# also succeed.
|
|
194 |
new_lockable = self.get_lockable() |
|
195 |
new_lockable.lock_write(token=token) |
|
196 |
new_lockable.unlock() |
|
197 |
finally: |
|
198 |
self.lockable.unlock() |
|
199 |
||
200 |
def test_unlock_after_lock_write_with_token(self): |
|
201 |
# If lock_write did not physically acquire the lock (because it was
|
|
202 |
# passed a token), then unlock should not physically release it.
|
|
203 |
token = self.lockable.lock_write() |
|
204 |
try: |
|
205 |
if token is None: |
|
206 |
# This test does not apply, because this lockable refuses
|
|
207 |
# tokens.
|
|
208 |
return
|
|
209 |
new_lockable = self.get_lockable() |
|
210 |
new_lockable.lock_write(token=token) |
|
211 |
new_lockable.unlock() |
|
212 |
self.assertTrue(self.lockable.get_physical_lock_status()) |
|
213 |
finally: |
|
214 |
self.lockable.unlock() |
|
215 |
||
216 |
def test_lock_write_with_token_fails_when_unlocked(self): |
|
217 |
# Lock and unlock to get a superficially valid token. This mimics a
|
|
218 |
# likely programming error, where a caller accidentally tries to lock
|
|
219 |
# with a token that is no longer valid (because the original lock was
|
|
220 |
# released).
|
|
221 |
token = self.lockable.lock_write() |
|
222 |
self.lockable.unlock() |
|
223 |
if token is None: |
|
224 |
# This test does not apply, because this lockable refuses
|
|
225 |
# tokens.
|
|
226 |
return
|
|
227 |
||
228 |
self.assertRaises(errors.TokenMismatch, |
|
229 |
self.lockable.lock_write, token=token) |
|
230 |
||
231 |
def test_lock_write_reenter_with_token(self): |
|
232 |
token = self.lockable.lock_write() |
|
233 |
try: |
|
234 |
if token is None: |
|
235 |
# This test does not apply, because this lockable refuses
|
|
236 |
# tokens.
|
|
237 |
return
|
|
238 |
# Relock with a token.
|
|
2279.7.7
by Andrew Bennetts
LockDir, Repository and Branch lock token changes from the hpss branch. |
239 |
token_from_reentry = self.lockable.lock_write(token=token) |
240 |
try: |
|
241 |
self.assertEqual(token, token_from_reentry) |
|
242 |
finally: |
|
243 |
self.lockable.unlock() |
|
2279.7.1
by Andrew Bennetts
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that |
244 |
finally: |
245 |
self.lockable.unlock() |
|
246 |
# The lock should be unlocked on disk. Verify that with a new lock
|
|
247 |
# instance.
|
|
248 |
new_lockable = self.get_lockable() |
|
249 |
# Calling lock_write now should work, rather than raise LockContention.
|
|
250 |
new_lockable.lock_write() |
|
251 |
new_lockable.unlock() |
|
252 |
||
2279.7.11
by Andrew Bennetts
Remove some XXXs. |
253 |
def test_second_lock_write_returns_same_token(self): |
254 |
first_token = self.lockable.lock_write() |
|
255 |
try: |
|
256 |
if first_token is None: |
|
257 |
# This test does not apply, because this lockable refuses
|
|
258 |
# tokens.
|
|
259 |
return
|
|
260 |
# Relock the already locked lockable. It should return the same
|
|
261 |
# token.
|
|
262 |
second_token = self.lockable.lock_write() |
|
263 |
try: |
|
264 |
self.assertEqual(first_token, second_token) |
|
265 |
finally: |
|
266 |
self.lockable.unlock() |
|
267 |
finally: |
|
268 |
self.lockable.unlock() |
|
269 |
||
2279.7.7
by Andrew Bennetts
LockDir, Repository and Branch lock token changes from the hpss branch. |
270 |
def test_leave_in_place(self): |
271 |
token = self.lockable.lock_write() |
|
272 |
try: |
|
273 |
if token is None: |
|
274 |
# This test does not apply, because this lockable refuses
|
|
275 |
# tokens.
|
|
276 |
return
|
|
277 |
self.lockable.leave_in_place() |
|
278 |
finally: |
|
279 |
self.lockable.unlock() |
|
280 |
# At this point, the lock is still in place on disk
|
|
281 |
self.assertRaises(errors.LockContention, self.lockable.lock_write) |
|
282 |
# But should be relockable with a token.
|
|
283 |
self.lockable.lock_write(token=token) |
|
284 |
self.lockable.unlock() |
|
285 |
||
286 |
def test_dont_leave_in_place(self): |
|
287 |
token = self.lockable.lock_write() |
|
288 |
try: |
|
289 |
if token is None: |
|
290 |
# This test does not apply, because this lockable refuses
|
|
291 |
# tokens.
|
|
292 |
return
|
|
293 |
self.lockable.leave_in_place() |
|
294 |
finally: |
|
295 |
self.lockable.unlock() |
|
296 |
# At this point, the lock is still in place on disk.
|
|
297 |
# Acquire the existing lock with the token, and ask that it is removed
|
|
298 |
# when this object unlocks, and unlock to trigger that removal.
|
|
299 |
new_lockable = self.get_lockable() |
|
300 |
new_lockable.lock_write(token=token) |
|
301 |
new_lockable.dont_leave_in_place() |
|
302 |
new_lockable.unlock() |
|
303 |
# At this point, the lock is no longer on disk, so we can lock it.
|
|
304 |
third_lockable = self.get_lockable() |
|
305 |
third_lockable.lock_write() |
|
306 |
third_lockable.unlock() |
|
307 |
||
308 |
||
2279.7.1
by Andrew Bennetts
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that |
309 |
|
310 |
||
311 |
||
1553.5.42
by Martin Pool
Start to parameterize LockableFiles test cases. |
312 |
|
313 |
# This method of adapting tests to parameters is different to
|
|
314 |
# the TestProviderAdapters used elsewhere, but seems simpler for this
|
|
315 |
# case.
|
|
1553.5.45
by Martin Pool
Clean up Transport-based locks for old branches |
316 |
class TestLockableFiles_TransportLock(TestCaseInTempDir, |
317 |
_TestLockableFiles_mixin): |
|
1553.5.42
by Martin Pool
Start to parameterize LockableFiles test cases. |
318 |
|
319 |
def setUp(self): |
|
2279.7.1
by Andrew Bennetts
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that |
320 |
TestCaseInTempDir.setUp(self) |
1553.5.42
by Martin Pool
Start to parameterize LockableFiles test cases. |
321 |
transport = get_transport('.') |
322 |
transport.mkdir('.bzr') |
|
1687.1.6
by Robert Collins
Extend LockableFiles to support break_lock() calls. |
323 |
self.sub_transport = transport.clone('.bzr') |
324 |
self.lockable = self.get_lockable() |
|
1553.5.61
by Martin Pool
Locks protecting LockableFiles must now be explicitly created before use. |
325 |
self.lockable.create_lock() |
1687.1.6
by Robert Collins
Extend LockableFiles to support break_lock() calls. |
326 |
|
327 |
def tearDown(self): |
|
328 |
super(TestLockableFiles_TransportLock, self).tearDown() |
|
1687.1.15
by Robert Collins
Review comments. |
329 |
# free the subtransport so that we do not get a 5 second
|
330 |
# timeout due to the SFTP connection cache.
|
|
1687.1.6
by Robert Collins
Extend LockableFiles to support break_lock() calls. |
331 |
del self.sub_transport |
332 |
||
333 |
def get_lockable(self): |
|
334 |
return LockableFiles(self.sub_transport, 'my-lock', TransportLock) |
|
1553.5.43
by Martin Pool
Get LockableFiles tests running against LockDir |
335 |
|
336 |
||
337 |
class TestLockableFiles_LockDir(TestCaseInTempDir, |
|
338 |
_TestLockableFiles_mixin): |
|
339 |
"""LockableFile tests run with LockDir underneath""" |
|
340 |
||
341 |
def setUp(self): |
|
2279.7.1
by Andrew Bennetts
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that |
342 |
TestCaseInTempDir.setUp(self) |
1553.5.61
by Martin Pool
Locks protecting LockableFiles must now be explicitly created before use. |
343 |
self.transport = get_transport('.') |
1687.1.6
by Robert Collins
Extend LockableFiles to support break_lock() calls. |
344 |
self.lockable = self.get_lockable() |
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
345 |
# the lock creation here sets mode - test_permissions on branch
|
346 |
# tests that implicitly, but it might be a good idea to factor
|
|
347 |
# out the mode checking logic and have it applied to loackable files
|
|
348 |
# directly. RBC 20060418
|
|
1553.5.61
by Martin Pool
Locks protecting LockableFiles must now be explicitly created before use. |
349 |
self.lockable.create_lock() |
1553.5.43
by Martin Pool
Get LockableFiles tests running against LockDir |
350 |
|
1687.1.6
by Robert Collins
Extend LockableFiles to support break_lock() calls. |
351 |
def get_lockable(self): |
352 |
return LockableFiles(self.transport, 'my-lock', LockDir) |
|
1553.5.60
by Martin Pool
New LockableFiles.create_lock() method |
353 |
|
354 |
def test_lock_created(self): |
|
1553.5.61
by Martin Pool
Locks protecting LockableFiles must now be explicitly created before use. |
355 |
self.assertTrue(self.transport.has('my-lock')) |
356 |
self.lockable.lock_write() |
|
357 |
self.assertTrue(self.transport.has('my-lock/held/info')) |
|
358 |
self.lockable.unlock() |
|
359 |
self.assertFalse(self.transport.has('my-lock/held/info')) |
|
360 |
self.assertTrue(self.transport.has('my-lock')) |
|
361 |
||
362 |
||
363 |
# TODO: Test the lockdir inherits the right file and directory permissions
|
|
364 |
# from the LockableFiles.
|