/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/lock_helpers.py

  • Committer: Vincent Ladeuil
  • Date: 2007-12-21 12:20:33 UTC
  • mto: (3146.3.1 179368) (3156.2.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3158.
  • Revision ID: v.ladeuil+lp@free.fr-20071221122033-42bc21re0zj4kqbg
Merge back test_http_implementations.pc into test_http.py.

* bzrlib/tests/test_http.py: 
Merge test_http_implementations.py now that we have rewritten
load_tests. That should reduce the noise in the final proposed
patch.

* bzrlib/tests/http_server.py:
(TestingHTTPRequestHandler.log_message): Ghaaa, don't over spell-check.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/lock_helpers.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Helper functions/classes for testing locking"""
18
18
 
19
19
from bzrlib import errors
20
 
from bzrlib.decorators import only_raises
21
20
 
22
21
 
23
22
class TestPreventLocking(errors.LockError):
45
44
        self.__dict__['_allow_read'] = True
46
45
        self.__dict__['_allow_unlock'] = True
47
46
 
48
 
    def __eq__(self, other):
49
 
        # Branch objects look for controlfiles == repo.controlfiles.
50
 
        if type(other) is LockWrapper:
51
 
            return self._other == other._other
52
 
        return False
53
 
 
54
47
    def __getattr__(self, attr):
55
48
        return getattr(self._other, attr)
56
49
 
69
62
            return self._other.lock_write()
70
63
        raise TestPreventLocking('lock_write disabled')
71
64
 
72
 
    @only_raises(errors.LockNotHeld, errors.LockBroken)
73
65
    def unlock(self):
74
66
        self._sequence.append((self._other_id, 'ul', self._allow_unlock))
75
67
        if self._allow_unlock: