/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockable_files.py

  • Committer: Andrew Bennetts
  • Date: 2007-04-11 13:35:32 UTC
  • mto: (2018.5.146 hpss)
  • mto: This revision was merged to the branch mainline in revision 2414.
  • Revision ID: andrew.bennetts@canonical.com-20070411133532-u6x6edf3dmzamnaq
LockDir, Repository and Branch lock token changes from the hpss branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockable_files.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from StringIO import StringIO
18
18
 
19
19
import bzrlib
20
 
from bzrlib import (
21
 
    errors,
22
 
    lockdir,
23
 
    osutils,
24
 
    )
 
20
from bzrlib.branch import Branch
 
21
import bzrlib.errors as errors
25
22
from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError
26
23
from bzrlib.lockable_files import LockableFiles, TransportLock
27
 
from bzrlib.symbol_versioning import (
28
 
    deprecated_in,
29
 
    )
30
 
from bzrlib.tests import (
31
 
    TestCaseInTempDir,
32
 
    TestNotApplicable,
33
 
    )
34
 
from bzrlib.tests.test_smart import TestCaseWithSmartMedium
 
24
from bzrlib import lockdir
 
25
from bzrlib.lockdir import LockDir
 
26
from bzrlib.tests import TestCaseInTempDir
35
27
from bzrlib.tests.test_transactions import DummyWeave
36
28
from bzrlib.transactions import (PassThroughTransaction,
37
29
                                 ReadOnlyTransaction,
41
33
 
42
34
 
43
35
# these tests are applied in each parameterized suite for LockableFiles
44
 
#
45
 
# they use an old style of parameterization, but we want to remove this class
46
 
# so won't modernize them now. - mbp 20080430
47
36
class _TestLockableFiles_mixin(object):
48
37
 
 
38
    def setUp(self):
 
39
        self.reduceLockdirTimeout()
 
40
 
 
41
    def test_read_write(self):
 
42
        self.assertRaises(NoSuchFile, self.lockable.get, 'foo')
 
43
        self.assertRaises(NoSuchFile, self.lockable.get_utf8, 'foo')
 
44
        self.lockable.lock_write()
 
45
        try:
 
46
            unicode_string = u'bar\u1234'
 
47
            self.assertEqual(4, len(unicode_string))
 
48
            byte_string = unicode_string.encode('utf-8')
 
49
            self.assertEqual(6, len(byte_string))
 
50
            self.assertRaises(UnicodeEncodeError, self.lockable.put, 'foo', 
 
51
                              StringIO(unicode_string))
 
52
            self.lockable.put('foo', StringIO(byte_string))
 
53
            self.assertEqual(byte_string,
 
54
                             self.lockable.get('foo').read())
 
55
            self.assertEqual(unicode_string,
 
56
                             self.lockable.get_utf8('foo').read())
 
57
            self.assertRaises(BzrBadParameterNotString,
 
58
                              self.lockable.put_utf8,
 
59
                              'bar',
 
60
                              StringIO(unicode_string)
 
61
                              )
 
62
            self.lockable.put_utf8('bar', unicode_string)
 
63
            self.assertEqual(unicode_string,
 
64
                             self.lockable.get_utf8('bar').read())
 
65
            self.assertEqual(byte_string,
 
66
                             self.lockable.get('bar').read())
 
67
            self.lockable.put_bytes('raw', 'raw\xffbytes')
 
68
            self.assertEqual('raw\xffbytes',
 
69
                             self.lockable.get('raw').read())
 
70
        finally:
 
71
            self.lockable.unlock()
 
72
 
 
73
    def test_locks(self):
 
74
        self.lockable.lock_read()
 
75
        try:
 
76
            self.assertRaises(ReadOnlyError, self.lockable.put, 'foo', 
 
77
                              StringIO('bar\u1234'))
 
78
        finally:
 
79
            self.lockable.unlock()
 
80
 
49
81
    def test_transactions(self):
50
82
        self.assertIs(self.lockable.get_transaction().__class__,
51
83
                      PassThroughTransaction)
68
100
 
69
101
    def test__escape(self):
70
102
        self.assertEqual('%25', self.lockable._escape('%'))
71
 
 
 
103
        
72
104
    def test__escape_empty(self):
73
105
        self.assertEqual('', self.lockable._escape(''))
74
106
 
80
112
        except NotImplementedError:
81
113
            # this lock cannot be broken
82
114
            self.lockable.unlock()
83
 
            raise TestNotApplicable("%r is not breakable" % (self.lockable,))
 
115
            return
84
116
        l2 = self.get_lockable()
85
117
        orig_factory = bzrlib.ui.ui_factory
86
118
        # silent ui - no need for stdout
87
 
        bzrlib.ui.ui_factory = bzrlib.ui.CannedInputUIFactory([True])
 
119
        bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
 
120
        bzrlib.ui.ui_factory.stdin = StringIO("y\n")
88
121
        try:
89
122
            l2.break_lock()
90
123
        finally:
98
131
 
99
132
    def test_lock_write_returns_None_refuses_token(self):
100
133
        token = self.lockable.lock_write()
101
 
        self.addCleanup(self.lockable.unlock)
102
 
        if token is not None:
103
 
            # This test does not apply, because this lockable supports
104
 
            # tokens.
105
 
            raise TestNotApplicable("%r uses tokens" % (self.lockable,))
106
 
        self.assertRaises(errors.TokenLockingNotSupported,
107
 
                          self.lockable.lock_write, token='token')
 
134
        try:
 
135
            if token is not None:
 
136
                # This test does not apply, because this lockable supports
 
137
                # tokens.
 
138
                return
 
139
            self.assertRaises(errors.TokenLockingNotSupported,
 
140
                              self.lockable.lock_write, token='token')
 
141
        finally:
 
142
            self.lockable.unlock()
108
143
 
109
144
    def test_lock_write_returns_token_when_given_token(self):
110
145
        token = self.lockable.lock_write()
111
 
        self.addCleanup(self.lockable.unlock)
112
 
        if token is None:
113
 
            # This test does not apply, because this lockable refuses
114
 
            # tokens.
115
 
            return
116
 
        new_lockable = self.get_lockable()
117
 
        token_from_new_lockable = new_lockable.lock_write(token=token)
118
 
        self.addCleanup(new_lockable.unlock)
119
 
        self.assertEqual(token, token_from_new_lockable)
 
146
        try:
 
147
            if token is None:
 
148
                # This test does not apply, because this lockable refuses
 
149
                # tokens.
 
150
                return
 
151
            new_lockable = self.get_lockable()
 
152
            token_from_new_lockable = new_lockable.lock_write(token=token)
 
153
            try:
 
154
                self.assertEqual(token, token_from_new_lockable)
 
155
            finally:
 
156
                new_lockable.unlock()
 
157
        finally:
 
158
            self.lockable.unlock()
120
159
 
121
160
    def test_lock_write_raises_on_token_mismatch(self):
122
161
        token = self.lockable.lock_write()
123
 
        self.addCleanup(self.lockable.unlock)
124
 
        if token is None:
125
 
            # This test does not apply, because this lockable refuses
126
 
            # tokens.
127
 
            return
128
 
        different_token = token + 'xxx'
129
 
        # Re-using the same lockable instance with a different token will
130
 
        # raise TokenMismatch.
131
 
        self.assertRaises(errors.TokenMismatch,
132
 
                          self.lockable.lock_write, token=different_token)
133
 
        # A separate instance for the same lockable will also raise
134
 
        # TokenMismatch.
135
 
        # This detects the case where a caller claims to have a lock (via
136
 
        # the token) for an external resource, but doesn't (the token is
137
 
        # different).  Clients need a separate lock object to make sure the
138
 
        # external resource is probed, whereas the existing lock object
139
 
        # might cache.
140
 
        new_lockable = self.get_lockable()
141
 
        self.assertRaises(errors.TokenMismatch,
142
 
                          new_lockable.lock_write, token=different_token)
 
162
        try:
 
163
            if token is None:
 
164
                # This test does not apply, because this lockable refuses
 
165
                # tokens.
 
166
                return
 
167
            different_token = token + 'xxx'
 
168
            # Re-using the same lockable instance with a different token will
 
169
            # raise TokenMismatch.
 
170
            self.assertRaises(errors.TokenMismatch,
 
171
                              self.lockable.lock_write, token=different_token)
 
172
            # A seperate instance for the same lockable will also raise
 
173
            # TokenMismatch.
 
174
            # This detects the case where a caller claims to have a lock (via
 
175
            # the token) for an external resource, but doesn't (the token is
 
176
            # different).  Clients need a seperate lock object to make sure the
 
177
            # external resource is probed, whereas the existing lock object
 
178
            # might cache.
 
179
            new_lockable = self.get_lockable()
 
180
            self.assertRaises(errors.TokenMismatch,
 
181
                              new_lockable.lock_write, token=different_token)
 
182
        finally:
 
183
            self.lockable.unlock()
143
184
 
144
185
    def test_lock_write_with_matching_token(self):
145
186
        # If the token matches, so no exception is raised by lock_write.
146
187
        token = self.lockable.lock_write()
147
 
        self.addCleanup(self.lockable.unlock)
148
 
        if token is None:
149
 
            # This test does not apply, because this lockable refuses
150
 
            # tokens.
151
 
            return
152
 
        # The same instance will accept a second lock_write if the specified
153
 
        # token matches.
154
 
        self.lockable.lock_write(token=token)
155
 
        self.lockable.unlock()
156
 
        # Calling lock_write on a new instance for the same lockable will
157
 
        # also succeed.
158
 
        new_lockable = self.get_lockable()
159
 
        new_lockable.lock_write(token=token)
160
 
        new_lockable.unlock()
 
188
        try:
 
189
            if token is None:
 
190
                # This test does not apply, because this lockable refuses
 
191
                # tokens.
 
192
                return
 
193
            # The same instance will accept a second lock_write if the specified
 
194
            # token matches.
 
195
            self.lockable.lock_write(token=token)
 
196
            self.lockable.unlock()
 
197
            # Calling lock_write on a new instance for the same lockable will
 
198
            # also succeed.
 
199
            new_lockable = self.get_lockable()
 
200
            new_lockable.lock_write(token=token)
 
201
            new_lockable.unlock()
 
202
        finally:
 
203
            self.lockable.unlock()
161
204
 
162
205
    def test_unlock_after_lock_write_with_token(self):
163
206
        # If lock_write did not physically acquire the lock (because it was
164
207
        # passed a token), then unlock should not physically release it.
165
208
        token = self.lockable.lock_write()
166
 
        self.addCleanup(self.lockable.unlock)
167
 
        if token is None:
168
 
            # This test does not apply, because this lockable refuses
169
 
            # tokens.
170
 
            return
171
 
        new_lockable = self.get_lockable()
172
 
        new_lockable.lock_write(token=token)
173
 
        new_lockable.unlock()
174
 
        self.assertTrue(self.lockable.get_physical_lock_status())
 
209
        try:
 
210
            if token is None:
 
211
                # This test does not apply, because this lockable refuses
 
212
                # tokens.
 
213
                return
 
214
            new_lockable = self.get_lockable()
 
215
            new_lockable.lock_write(token=token)
 
216
            new_lockable.unlock()
 
217
            self.assertTrue(self.lockable.get_physical_lock_status())
 
218
        finally:
 
219
            self.lockable.unlock()
175
220
 
176
221
    def test_lock_write_with_token_fails_when_unlocked(self):
177
222
        # Lock and unlock to get a superficially valid token.  This mimics a
210
255
        new_lockable.lock_write()
211
256
        new_lockable.unlock()
212
257
 
213
 
    def test_second_lock_write_returns_same_token(self):
214
 
        first_token = self.lockable.lock_write()
215
 
        try:
216
 
            if first_token is None:
217
 
                # This test does not apply, because this lockable refuses
218
 
                # tokens.
219
 
                return
220
 
            # Relock the already locked lockable.  It should return the same
221
 
            # token.
222
 
            second_token = self.lockable.lock_write()
223
 
            try:
224
 
                self.assertEqual(first_token, second_token)
225
 
            finally:
226
 
                self.lockable.unlock()
227
 
        finally:
228
 
            self.lockable.unlock()
229
 
 
230
258
    def test_leave_in_place(self):
231
259
        token = self.lockable.lock_write()
232
260
        try:
242
270
        # But should be relockable with a token.
243
271
        self.lockable.lock_write(token=token)
244
272
        self.lockable.unlock()
245
 
        # Cleanup: we should still be able to get the lock, but we restore the
246
 
        # behavior to clearing the lock when unlocking.
247
 
        self.lockable.lock_write(token=token)
248
 
        self.lockable.dont_leave_in_place()
249
 
        self.lockable.unlock()
250
273
 
251
274
    def test_dont_leave_in_place(self):
252
275
        token = self.lockable.lock_write()
271
294
        third_lockable.unlock()
272
295
 
273
296
 
274
 
# This method of adapting tests to parameters is different to
275
 
# the TestProviderAdapters used elsewhere, but seems simpler for this
276
 
# case.
 
297
 
 
298
 
 
299
 
 
300
 
 
301
# This method of adapting tests to parameters is different to 
 
302
# the TestProviderAdapters used elsewhere, but seems simpler for this 
 
303
# case.  
277
304
class TestLockableFiles_TransportLock(TestCaseInTempDir,
278
305
                                      _TestLockableFiles_mixin):
279
306
 
280
307
    def setUp(self):
281
308
        TestCaseInTempDir.setUp(self)
 
309
        _TestLockableFiles_mixin.setUp(self)
282
310
        transport = get_transport('.')
283
311
        transport.mkdir('.bzr')
284
312
        self.sub_transport = transport.clone('.bzr')
285
313
        self.lockable = self.get_lockable()
286
314
        self.lockable.create_lock()
287
315
 
288
 
    def stop_server(self):
289
 
        super(TestLockableFiles_TransportLock, self).stop_server()
 
316
    def tearDown(self):
 
317
        super(TestLockableFiles_TransportLock, self).tearDown()
290
318
        # free the subtransport so that we do not get a 5 second
291
319
        # timeout due to the SFTP connection cache.
292
 
        try:
293
 
            del self.sub_transport
294
 
        except AttributeError:
295
 
            pass
 
320
        del self.sub_transport
296
321
 
297
322
    def get_lockable(self):
298
323
        return LockableFiles(self.sub_transport, 'my-lock', TransportLock)
299
 
 
 
324
        
300
325
 
301
326
class TestLockableFiles_LockDir(TestCaseInTempDir,
302
327
                              _TestLockableFiles_mixin):
304
329
 
305
330
    def setUp(self):
306
331
        TestCaseInTempDir.setUp(self)
 
332
        _TestLockableFiles_mixin.setUp(self)
307
333
        self.transport = get_transport('.')
308
334
        self.lockable = self.get_lockable()
309
 
        # the lock creation here sets mode - test_permissions on branch
310
 
        # tests that implicitly, but it might be a good idea to factor
 
335
        # the lock creation here sets mode - test_permissions on branch 
 
336
        # tests that implicitly, but it might be a good idea to factor 
311
337
        # out the mode checking logic and have it applied to loackable files
312
338
        # directly. RBC 20060418
313
339
        self.lockable.create_lock()
314
340
 
315
341
    def get_lockable(self):
316
 
        return LockableFiles(self.transport, 'my-lock', lockdir.LockDir)
 
342
        return LockableFiles(self.transport, 'my-lock', LockDir)
317
343
 
318
344
    def test_lock_created(self):
319
345
        self.assertTrue(self.transport.has('my-lock'))
323
349
        self.assertFalse(self.transport.has('my-lock/held/info'))
324
350
        self.assertTrue(self.transport.has('my-lock'))
325
351
 
326
 
    def test__file_modes(self):
327
 
        self.transport.mkdir('readonly')
328
 
        osutils.make_readonly('readonly')
329
 
        lockable = LockableFiles(self.transport.clone('readonly'), 'test-lock',
330
 
                                 lockdir.LockDir)
331
 
        # The directory mode should be read-write-execute for the current user
332
 
        self.assertEqual(00700, lockable._dir_mode & 00700)
333
 
        # Files should be read-write for the current user
334
 
        self.assertEqual(00600, lockable._file_mode & 00700)
335
 
 
336
 
 
337
 
class TestLockableFiles_RemoteLockDir(TestCaseWithSmartMedium,
338
 
                              _TestLockableFiles_mixin):
339
 
    """LockableFile tests run with RemoteLockDir on a branch."""
340
 
 
341
 
    def setUp(self):
342
 
        TestCaseWithSmartMedium.setUp(self)
343
 
        # can only get a RemoteLockDir with some RemoteObject...
344
 
        # use a branch as thats what we want. These mixin tests test the end
345
 
        # to end behaviour, so stubbing out the backend and simulating would
346
 
        # defeat the purpose. We test the protocol implementation separately
347
 
        # in test_remote and test_smart as usual.
348
 
        b = self.make_branch('foo')
349
 
        self.addCleanup(b.bzrdir.transport.disconnect)
350
 
        self.transport = get_transport('.')
351
 
        self.lockable = self.get_lockable()
352
 
 
353
 
    def get_lockable(self):
354
 
        # getting a new lockable involves opening a new instance of the branch
355
 
        branch = bzrlib.branch.Branch.open(self.get_url('foo'))
356
 
        self.addCleanup(branch.bzrdir.transport.disconnect)
357
 
        return branch.control_files
 
352
 
 
353
    # TODO: Test the lockdir inherits the right file and directory permissions
 
354
    # from the LockableFiles.