/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/branch_implementations/test_break_lock.py

First attempt to merge .dev and resolve the conflicts (but tests are 
failing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_break_lock.py
1
 
# (C) 2006 Canonical Ltd
 
1
# Copyright (C) 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
20
20
 
21
21
import bzrlib
22
22
import bzrlib.errors as errors
23
 
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
 
23
from bzrlib.tests import TestCase, TestCaseWithTransport, TestNotApplicable
24
24
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
25
25
 
26
26
 
51
51
        # break lock on the branch should try on the repository even
52
52
        # if the branch isn't locked
53
53
        self.branch.repository.lock_write()
 
54
        other_instance = self.branch.repository.bzrdir.open_repository()
 
55
        if not other_instance.get_physical_lock_status():
 
56
            raise TestNotApplicable("Repository does not lock persistently.")
54
57
        bzrlib.ui.ui_factory.stdin = StringIO("y\n")
55
58
        try:
56
59
            self.unused_branch.break_lock()