Bazaar

Merge lp:~jelmer/bzr/test-repo-is-locked into lp:bzr

  1. test-repo-is-locked
  2. Merge into bzr.dev
Proposed by Jelmer Vernooij
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: 5872
Proposed branch: lp:~jelmer/bzr/test-repo-is-locked
Merge into: lp:bzr
Diff against target: 40 lines (+20/-1)
2 files modified
bzrlib/tests/per_repository/__init__.py (+1/-1)
bzrlib/tests/per_repository/test_locking.py (+19/-0)
To merge this branch: bzr merge lp:~jelmer/bzr/test-repo-is-locked
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+61106@code.launchpad.net

Commit message

Add tests for Repository.is_locked.

Description of the change

Add tests for Repository.is_locked.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 05/16/2011 02:53 PM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr/test-repo-is-locked into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> Bug #126895 in Bazaar: "Repository,is_locked is not interface tested"
> https://bugs.launchpad.net/bzr/+bug/126895
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr/test-repo-is-locked/+merge/61106
>
> Add tests for Repository.is_locked.

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk3RHrwACgkQJdeBCYSNAAMeUgCgs02RJiLaYyZkqPc0W628gkCs
HUoAoJY1FkNnuJopHbiR6IoJQeeLGt5F
=QG2b
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/tests/per_repository/__init__.py'
2--- bzrlib/tests/per_repository/__init__.py 2011-05-14 21:16:04 +0000
3+++ bzrlib/tests/per_repository/__init__.py 2011-05-16 12:56:44 +0000
4@@ -119,8 +119,8 @@
5 'test_get_parent_map',
6 'test_has_same_location',
7 'test_has_revisions',
8- 'test_is_write_locked',
9 'test_iter_reverse_revision_history',
10+ 'test_locking',
11 'test_merge_directive',
12 'test_pack',
13 'test_reconcile',
14
15=== renamed file 'bzrlib/tests/per_repository/test_is_write_locked.py' => 'bzrlib/tests/per_repository/test_locking.py'
16--- bzrlib/tests/per_repository/test_is_write_locked.py 2009-03-23 14:59:43 +0000
17+++ bzrlib/tests/per_repository/test_locking.py 2011-05-16 12:56:44 +0000
18@@ -36,3 +36,22 @@
19 repo.lock_write()
20 self.addCleanup(repo.unlock)
21 self.assertTrue(repo.is_write_locked())
22+
23+
24+class TestIsLocked(TestCaseWithRepository):
25+
26+ def test_not_locked(self):
27+ repo = self.make_repository('.')
28+ self.assertFalse(repo.is_locked())
29+
30+ def test_read_locked(self):
31+ repo = self.make_repository('.')
32+ repo.lock_read()
33+ self.addCleanup(repo.unlock)
34+ self.assertTrue(repo.is_locked())
35+
36+ def test_write_locked(self):
37+ repo = self.make_repository('.')
38+ repo.lock_write()
39+ self.addCleanup(repo.unlock)
40+ self.assertTrue(repo.is_locked())