← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/test_lp_open.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-18 14:09:19 UTC
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120118140919-rlvdrhpc0nq1lbwi
Change set/remove to require a lock for the branch config files.

This means that tests (or any plugin for that matter) do not requires an
explicit lock on the branch anymore to change a single option. This also
means the optimisation becomes "opt-in" and as such won't be as
spectacular as it may be and/or harder to get right (nothing fails
anymore).

This reduces the diff by ~300 lines.

Code/tests that were updating more than one config option is still taking
a lock to at least avoid some IOs and demonstrate the benefits through
the decreased number of hpss calls.

The duplication between BranchStack and BranchOnlyStack will be removed
once the same sharing is in place for local config files, at which point
the Stack class itself may be able to host the changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/test_lp_open.py
44
44
    def test_non_launchpad_branch(self):
45
45
        branch = self.make_branch('non-lp')
46
46
        url = 'http://example.com/non-lp'
47
 
        branch.lock_write()
48
 
        try:
49
 
            branch.set_public_branch(url)
50
 
        finally:
51
 
            branch.unlock()
 
47
        branch.set_public_branch(url)
52
48
        self.assertEqual(
53
49
            ['bzr: ERROR: %s is not registered on Launchpad.' % url],
54
50
            self.run_open('non-lp', retcode=3))
55
51
 
56
52
    def test_launchpad_branch_with_public_location(self):
57
53
        branch = self.make_branch('lp')
58
 
        branch.lock_write()
59
 
        try:
60
 
            branch.set_public_branch(
61
 
                'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
62
 
        finally:
63
 
            branch.unlock()
 
54
        branch.set_public_branch('bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
64
55
        self.assertEqual(
65
56
            ['Opening https://code.launchpad.net/~foo/bar/baz in web '
66
57
             'browser'],
85
76
        # lp-open falls back to the push location if it cannot find a public
86
77
        # location.
87
78
        branch = self.make_branch('lp')
88
 
        branch.lock_write()
89
 
        try:
90
 
            branch.set_push_location(
91
 
                'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
92
 
        finally:
93
 
            branch.unlock()
 
79
        branch.set_push_location('bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
94
80
        self.assertEqual(
95
81
            ['Opening https://code.launchpad.net/~foo/bar/baz in web '
96
82
             'browser'],
108
94
    def test_launchpad_branch_subdirectory(self):
109
95
        # lp-open in a subdirectory of a registered branch should work
110
96
        wt = self.make_branch_and_tree('lp')
111
 
        wt.branch.lock_write()
112
 
        try:
113
 
            wt.branch.set_push_location(
114
 
                'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
115
 
        finally:
116
 
            wt.branch.unlock()
 
97
        wt.branch.set_push_location(
 
98
            'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
117
99
        self.build_tree(['lp/a/'])
118
100
        self.assertEqual(
119
101
            ['Opening https://code.launchpad.net/~foo/bar/baz in web '