4449.3.31
by Martin Pool
Merge trunk |
1 |
# Copyright (C) 2006, 2009 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1687.1.8
by Robert Collins
Teach Branch about break_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 |
#
|
1687.1.8
by Robert Collins
Teach Branch about break_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 |
#
|
1687.1.8
by Robert Collins
Teach Branch about break_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
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
16 |
|
17 |
"""Tests for branch break-lock behaviour."""
|
|
18 |
||
19 |
from cStringIO import StringIO |
|
20 |
||
21 |
import bzrlib |
|
22 |
import bzrlib.errors as errors |
|
3015.2.4
by Robert Collins
Handle repositories that cannot be remotely locked in branch_implementations.test_break_lock. |
23 |
from bzrlib.tests import TestCase, TestCaseWithTransport, TestNotApplicable |
4523.1.1
by Martin Pool
Rename tests.branch_implementations to per_branch |
24 |
from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch |
4449.3.26
by Martin Pool
Change branch break-lock tests to use CannedInputUIFactory |
25 |
from bzrlib.ui import ( |
26 |
CannedInputUIFactory, |
|
27 |
)
|
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
28 |
|
29 |
||
30 |
class TestBreakLock(TestCaseWithBranch): |
|
31 |
||
32 |
def setUp(self): |
|
33 |
super(TestBreakLock, self).setUp() |
|
1687.1.10
by Robert Collins
Branch.break_lock should handle bound branches too |
34 |
self.unused_branch = self.make_branch('branch') |
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
35 |
self.branch = self.unused_branch.bzrdir.open_branch() |
36 |
# we want a UI factory that accepts canned input for the tests:
|
|
37 |
# while SilentUIFactory still accepts stdin, we need to customise
|
|
38 |
# ours
|
|
39 |
self.old_factory = bzrlib.ui.ui_factory |
|
1687.1.15
by Robert Collins
Review comments. |
40 |
self.addCleanup(self.restoreFactory) |
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
41 |
|
1687.1.15
by Robert Collins
Review comments. |
42 |
def restoreFactory(self): |
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
43 |
bzrlib.ui.ui_factory = self.old_factory |
44 |
||
45 |
def test_unlocked(self): |
|
46 |
# break lock when nothing is locked should just return
|
|
47 |
try: |
|
48 |
self.branch.break_lock() |
|
49 |
except NotImplementedError: |
|
50 |
pass
|
|
51 |
||
52 |
def test_unlocked_repo_locked(self): |
|
53 |
# break lock on the branch should try on the repository even
|
|
54 |
# if the branch isn't locked
|
|
1551.19.52
by Aaron Bentley
Fix test kipple by unlocking repo |
55 |
token = self.branch.repository.lock_write() |
56 |
if token is None: |
|
57 |
self.branch.repository.unlock() |
|
58 |
raise TestNotApplicable('Repository does not use physical locks.') |
|
59 |
self.branch.repository.leave_lock_in_place() |
|
60 |
self.branch.repository.unlock() |
|
3015.2.4
by Robert Collins
Handle repositories that cannot be remotely locked in branch_implementations.test_break_lock. |
61 |
other_instance = self.branch.repository.bzrdir.open_repository() |
62 |
if not other_instance.get_physical_lock_status(): |
|
63 |
raise TestNotApplicable("Repository does not lock persistently.") |
|
4449.3.26
by Martin Pool
Change branch break-lock tests to use CannedInputUIFactory |
64 |
bzrlib.ui.ui_factory = CannedInputUIFactory([True]) |
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
65 |
try: |
66 |
self.unused_branch.break_lock() |
|
67 |
except NotImplementedError: |
|
68 |
# branch does not support break_lock
|
|
69 |
self.branch.repository.unlock() |
|
70 |
return
|
|
71 |
self.assertRaises(errors.LockBroken, self.branch.repository.unlock) |
|
72 |
||
73 |
def test_locked(self): |
|
1687.1.10
by Robert Collins
Branch.break_lock should handle bound branches too |
74 |
# break_lock when locked should unlock the branch and repo
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
75 |
self.branch.lock_write() |
4449.3.26
by Martin Pool
Change branch break-lock tests to use CannedInputUIFactory |
76 |
bzrlib.ui.ui_factory = CannedInputUIFactory([True, True]) |
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
77 |
try: |
78 |
self.unused_branch.break_lock() |
|
79 |
except NotImplementedError: |
|
80 |
# branch does not support break_lock
|
|
81 |
self.branch.unlock() |
|
82 |
return
|
|
83 |
self.assertRaises(errors.LockBroken, self.branch.unlock) |
|
1687.1.10
by Robert Collins
Branch.break_lock should handle bound branches too |
84 |
|
85 |
def test_unlocks_master_branch(self): |
|
4031.3.1
by Frank Aspell
Fixing various typos |
86 |
# break_lock when the master branch is locked should offer to
|
1687.1.10
by Robert Collins
Branch.break_lock should handle bound branches too |
87 |
# unlock it.
|
88 |
master = self.make_branch('master') |
|
89 |
try: |
|
90 |
self.branch.bind(master) |
|
91 |
except errors.UpgradeRequired: |
|
92 |
# this branch does not support binding.
|
|
93 |
return
|
|
94 |
master.lock_write() |
|
4449.3.26
by Martin Pool
Change branch break-lock tests to use CannedInputUIFactory |
95 |
bzrlib.ui.ui_factory = CannedInputUIFactory([True, True]) |
1687.1.10
by Robert Collins
Branch.break_lock should handle bound branches too |
96 |
try: |
97 |
self.unused_branch.break_lock() |
|
98 |
except NotImplementedError: |
|
99 |
# branch does not support break_lock
|
|
100 |
master.unlock() |
|
101 |
return
|
|
102 |
self.assertRaises(errors.LockBroken, master.unlock) |
|
103 |
# can we lock it now ?
|
|
104 |
master.lock_write() |
|
105 |
master.unlock() |
|
106 |