← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
22
22
import sys
23
23
 
24
24
import bzrlib.branch
25
 
import bzrlib.bzrdir as bzrdir
 
25
from bzrlib import (
 
26
    bzrdir,
 
27
    errors,
 
28
    lockdir,
 
29
    repository,
 
30
    transactions,
 
31
    transport,
 
32
    ui,
 
33
    workingtree,
 
34
    )
26
35
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
27
36
from bzrlib.check import check
28
 
import bzrlib.errors as errors
29
37
from bzrlib.errors import (FileExists,
30
38
                           NoSuchRevision,
31
39
                           NoSuchFile,
32
40
                           UninitializableFormat,
33
41
                           NotBranchError,
34
42
                           )
35
 
import bzrlib.repository as repository
36
43
import bzrlib.revision
37
44
from bzrlib.tests import (
38
45
                          ChrootedTestCase,
41
48
                          TestSkipped,
42
49
                          )
43
50
from bzrlib.trace import mutter
44
 
import bzrlib.transactions as transactions
45
 
import bzrlib.transport as transport
46
51
from bzrlib.transport import get_transport
47
 
import bzrlib.ui as ui
48
52
from bzrlib.upgrade import upgrade
49
 
import bzrlib.workingtree as workingtree
50
53
 
51
54
 
52
55
class TestCaseWithBzrDir(TestCaseWithTransport):
1335
1338
        unused_repo = thisdir.create_repository()
1336
1339
        master.lock_write()
1337
1340
        unused_repo.lock_write()
1338
 
        # two yes's : branch and repository. If the repo in this
1339
 
        # dir is inappropriately accessed, 3 will be needed, and
1340
 
        # we'll see that because the stream will be fully consumed
1341
 
        bzrlib.ui.ui_factory.stdin = StringIO("y\ny\ny\n")
1342
 
        master.bzrdir.break_lock()
1343
 
        # only two ys should have been read
1344
 
        self.assertEqual("y\n", bzrlib.ui.ui_factory.stdin.read())
1345
 
        # we should be able to lock a newly opened branch now
1346
 
        branch = master.bzrdir.open_branch()
1347
 
        branch.lock_write()
1348
 
        branch.unlock()
1349
 
        # we should not be able to lock the repository in thisdir as its still
1350
 
        # held by the explicit lock we took, and the break lock should not have
1351
 
        # touched it.
1352
 
        repo = thisdir.open_repository()
1353
 
        self.assertRaises(errors.LockContention, repo.lock_write)
1354
 
        unused_repo.unlock()
 
1341
        try:
 
1342
            # two yes's : branch and repository. If the repo in this
 
1343
            # dir is inappropriately accessed, 3 will be needed, and
 
1344
            # we'll see that because the stream will be fully consumed
 
1345
            bzrlib.ui.ui_factory.stdin = StringIO("y\ny\ny\n")
 
1346
            master.bzrdir.break_lock()
 
1347
            # only two ys should have been read
 
1348
            self.assertEqual("y\n", bzrlib.ui.ui_factory.stdin.read())
 
1349
            # we should be able to lock a newly opened branch now
 
1350
            branch = master.bzrdir.open_branch()
 
1351
            branch.lock_write()
 
1352
            branch.unlock()
 
1353
            # we should not be able to lock the repository in thisdir as its still
 
1354
            # held by the explicit lock we took, and the break lock should not have
 
1355
            # touched it.
 
1356
            repo = thisdir.open_repository()
 
1357
            orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
 
1358
            try:
 
1359
                lockdir._DEFAULT_TIMEOUT_SECONDS = 1
 
1360
                self.assertRaises(errors.LockContention, repo.lock_write)
 
1361
            finally:
 
1362
                lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
 
1363
        finally:
 
1364
            unused_repo.unlock()
1355
1365
        self.assertRaises(errors.LockBroken, master.unlock)
1356
1366
 
1357
1367
    def test_break_lock_tree(self):