← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockable_files.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-03 01:53:30 UTC
  • mfrom: (2955.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071103015330-pt1tec7wyxwwcey8
Fix #158972 don't use timeout for HttpServer

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockable_files.py
1
 
# Copyright (C) 2005, 2006, 2008 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
17
17
from StringIO import StringIO
18
18
 
19
19
import bzrlib
20
 
from bzrlib import (
21
 
    errors,
22
 
    lockdir,
23
 
    osutils,
24
 
    )
 
20
import bzrlib.errors as errors
25
21
from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError
26
22
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
 
    )
 
23
from bzrlib import lockdir
 
24
from bzrlib.lockdir import LockDir
 
25
from bzrlib.tests import TestCaseInTempDir
34
26
from bzrlib.tests.test_smart import TestCaseWithSmartMedium
35
27
from bzrlib.tests.test_transactions import DummyWeave
36
28
from bzrlib.transactions import (PassThroughTransaction,
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
 
49
38
    def test_read_write(self):
50
 
        self.assertRaises(NoSuchFile,
51
 
            self.applyDeprecated,
52
 
            deprecated_in((1, 5, 0)),
53
 
            self.lockable.get, 'foo')
54
 
        self.assertRaises(NoSuchFile,
55
 
            self.applyDeprecated,
56
 
            deprecated_in((1, 5, 0)),
57
 
            self.lockable.get_utf8, 'foo')
 
39
        self.assertRaises(NoSuchFile, self.lockable.get, 'foo')
 
40
        self.assertRaises(NoSuchFile, self.lockable.get_utf8, 'foo')
58
41
        self.lockable.lock_write()
59
42
        try:
60
43
            unicode_string = u'bar\u1234'
61
44
            self.assertEqual(4, len(unicode_string))
62
45
            byte_string = unicode_string.encode('utf-8')
63
46
            self.assertEqual(6, len(byte_string))
64
 
            self.assertRaises(UnicodeEncodeError,
65
 
                self.applyDeprecated,
66
 
                deprecated_in((1, 6, 0)),
67
 
                self.lockable.put, 'foo',
68
 
                StringIO(unicode_string))
69
 
            self.applyDeprecated(
70
 
                deprecated_in((1, 6, 0)),
71
 
                self.lockable.put,
72
 
                'foo', StringIO(byte_string))
73
 
            byte_stream = self.applyDeprecated(
74
 
                deprecated_in((1, 5, 0)),
75
 
                self.lockable.get,
76
 
                'foo')
77
 
            self.assertEqual(byte_string, byte_stream.read())
78
 
            unicode_stream = self.applyDeprecated(
79
 
                deprecated_in((1, 5, 0)),
80
 
                self.lockable.get_utf8,
81
 
                'foo')
 
47
            self.assertRaises(UnicodeEncodeError, self.lockable.put, 'foo',
 
48
                              StringIO(unicode_string))
 
49
            self.lockable.put('foo', StringIO(byte_string))
 
50
            self.assertEqual(byte_string,
 
51
                             self.lockable.get('foo').read())
82
52
            self.assertEqual(unicode_string,
83
 
                unicode_stream.read())
 
53
                             self.lockable.get_utf8('foo').read())
84
54
            self.assertRaises(BzrBadParameterNotString,
85
 
                self.applyDeprecated,
86
 
                deprecated_in((1, 6, 0)),
87
 
                self.lockable.put_utf8,
88
 
                'bar',
89
 
                StringIO(unicode_string))
90
 
            self.applyDeprecated(
91
 
                deprecated_in((1, 6, 0)),
92
 
                self.lockable.put_utf8,
93
 
                'bar',
94
 
                unicode_string)
95
 
            unicode_stream = self.applyDeprecated(
96
 
                deprecated_in((1, 5, 0)),
97
 
                self.lockable.get_utf8,
98
 
                'bar')
 
55
                              self.lockable.put_utf8,
 
56
                              'bar',
 
57
                              StringIO(unicode_string)
 
58
                              )
 
59
            self.lockable.put_utf8('bar', unicode_string)
99
60
            self.assertEqual(unicode_string,
100
 
                unicode_stream.read())
101
 
            byte_stream = self.applyDeprecated(
102
 
                deprecated_in((1, 5, 0)),
103
 
                self.lockable.get,
104
 
                'bar')
105
 
            self.assertEqual(byte_string, byte_stream.read())
106
 
            self.applyDeprecated(
107
 
                deprecated_in((1, 6, 0)),
108
 
                self.lockable.put_bytes,
109
 
                'raw', 'raw\xffbytes')
110
 
            byte_stream = self.applyDeprecated(
111
 
                deprecated_in((1, 5, 0)),
112
 
                self.lockable.get,
113
 
                'raw')
114
 
            self.assertEqual('raw\xffbytes', byte_stream.read())
 
61
                             self.lockable.get_utf8('bar').read())
 
62
            self.assertEqual(byte_string,
 
63
                             self.lockable.get('bar').read())
 
64
            self.lockable.put_bytes('raw', 'raw\xffbytes')
 
65
            self.assertEqual('raw\xffbytes',
 
66
                             self.lockable.get('raw').read())
115
67
        finally:
116
68
            self.lockable.unlock()
117
69
 
118
70
    def test_locks(self):
119
71
        self.lockable.lock_read()
120
72
        try:
121
 
            self.assertRaises(ReadOnlyError, self.lockable.put, 'foo',
 
73
            self.assertRaises(ReadOnlyError, self.lockable.put, 'foo', 
122
74
                              StringIO('bar\u1234'))
123
75
        finally:
124
76
            self.lockable.unlock()
157
109
        except NotImplementedError:
158
110
            # this lock cannot be broken
159
111
            self.lockable.unlock()
160
 
            raise TestNotApplicable("%r is not breakable" % (self.lockable,))
 
112
            return
161
113
        l2 = self.get_lockable()
162
114
        orig_factory = bzrlib.ui.ui_factory
163
115
        # silent ui - no need for stdout
180
132
            if token is not None:
181
133
                # This test does not apply, because this lockable supports
182
134
                # tokens.
183
 
                raise TestNotApplicable("%r uses tokens" % (self.lockable,))
 
135
                return
184
136
            self.assertRaises(errors.TokenLockingNotSupported,
185
137
                              self.lockable.lock_write, token='token')
186
138
        finally:
374
326
        super(TestLockableFiles_TransportLock, self).tearDown()
375
327
        # free the subtransport so that we do not get a 5 second
376
328
        # timeout due to the SFTP connection cache.
377
 
        try:
378
 
            del self.sub_transport
379
 
        except AttributeError:
380
 
            pass
 
329
        del self.sub_transport
381
330
 
382
331
    def get_lockable(self):
383
332
        return LockableFiles(self.sub_transport, 'my-lock', TransportLock)
398
347
        self.lockable.create_lock()
399
348
 
400
349
    def get_lockable(self):
401
 
        return LockableFiles(self.transport, 'my-lock', lockdir.LockDir)
 
350
        return LockableFiles(self.transport, 'my-lock', LockDir)
402
351
 
403
352
    def test_lock_created(self):
404
353
        self.assertTrue(self.transport.has('my-lock'))
408
357
        self.assertFalse(self.transport.has('my-lock/held/info'))
409
358
        self.assertTrue(self.transport.has('my-lock'))
410
359
 
411
 
    def test__file_modes(self):
412
 
        self.transport.mkdir('readonly')
413
 
        osutils.make_readonly('readonly')
414
 
        lockable = LockableFiles(self.transport.clone('readonly'), 'test-lock',
415
 
                                 lockdir.LockDir)
416
 
        # The directory mode should be read-write-execute for the current user
417
 
        self.assertEqual(00700, lockable._dir_mode & 00700)
418
 
        # Files should be read-write for the current user
419
 
        self.assertEqual(00600, lockable._file_mode & 00700)
420
360
 
 
361
    # TODO: Test the lockdir inherits the right file and directory permissions
 
362
    # from the LockableFiles.
 
363
        
421
364
 
422
365
class TestLockableFiles_RemoteLockDir(TestCaseWithSmartMedium,
423
366
                              _TestLockableFiles_mixin):