/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: v.ladeuil+lp at free
  • Date: 2006-12-01 15:06:29 UTC
  • mto: (2172.3.1 bzr.73948)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: v.ladeuil+lp@free.fr-20061201150629-zjd2an87u0r7nhhw
The tests that would have help avoid bug #73948 and all that mess :)

* bzrlib/transport/http/response.py:
(handle_response): Translate a 416 http error code into a bzr
exception.

* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPDefaultErrorHandler.http_error_default): Translate a 416 http
error code into a bzr exception.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): It could happen that pycrul
itself detect a short read.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): New method, factorizing the retry
logic.
(HttpTransportBase.readv): We can have exception during the
initial GET worth degrading the range requirements (i.e. retrying
the GET request with either single or not ranges).

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv_short_read): InvalidRange can also be
raised.

* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_readv_invalid_ranges): Was named
test_readv_short_read, the new name make the intent
clearer. Depending of the code path used (urllib or pycurl), both
exceptions can be raised.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): If invalid ranges are
specified, returns a 416 instead of the whole file (both are valid
according to the RFC).

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
 
63
56
            return self._other.lock_read()
64
57
        raise TestPreventLocking('lock_read disabled')
65
58
 
66
 
    def lock_write(self, token=None):
 
59
    def lock_write(self):
67
60
        self._sequence.append((self._other_id, 'lw', self._allow_write))
68
61
        if self._allow_write:
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: