/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/test_hashcache.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/test_hashcache.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
import os
 
18
import sha
18
19
import stat
19
20
import sys
20
21
import time
21
22
 
22
 
from bzrlib import osutils
23
23
from bzrlib.errors import BzrError
24
24
from bzrlib.hashcache import HashCache
25
 
from bzrlib.tests import OsFifoFeature, TestCaseInTempDir, TestCase
 
25
from bzrlib.tests import TestCaseInTempDir, TestSkipped, TestCase
26
26
 
27
27
 
28
28
def sha1(t):
29
 
    return osutils.sha(t).hexdigest()
 
29
    return sha.new(t).hexdigest()
30
30
 
31
31
 
32
32
def pause():
111
111
 
112
112
    def test_hashcache_raise(self):
113
113
        """check that hashcache can raise BzrError"""
114
 
        self.requireFeature(OsFifoFeature)
115
114
        hc = self.make_hashcache()
 
115
        if getattr(os, 'mkfifo', None) is None:
 
116
            raise TestSkipped('filesystem fifos not supported on this system')
116
117
        os.mkfifo('a')
117
118
        # It's possible that the system supports fifos but the filesystem
118
119
        # can't.  In that case we should skip at this point.  But in fact
139
140
        abspath = './' + filename
140
141
        self._files[abspath] = (file_contents, self._clock)
141
142
 
142
 
    def _fingerprint(self, abspath, fs=None):
 
143
    def _fingerprint(self, abspath):
143
144
        entry = self._files[abspath]
144
145
        return (len(entry[0]),
145
146
                entry[1], entry[1],
146
147
                10, 20,
147
148
                stat.S_IFREG | 0600)
148
149
 
149
 
    def _really_sha1_file(self, abspath, filters):
 
150
    def _really_sha1_file(self, abspath):
150
151
        if abspath in self._files:
151
152
            return sha1(self._files[abspath][0])
152
153
        else:
158
159
    def pretend_to_sleep(self, secs):
159
160
        self._clock += secs
160
161
 
161
 
 
 
162
    
162
163
class TestHashCacheFakeFilesystem(TestCaseInTempDir):
163
164
    """Tests the hashcache using a simulated OS.
164
165
    """
173
174
        self.assertEquals(hc.get_sha1('foo'), sha1('hello'))
174
175
        self.assertEquals(hc.miss_count, 1)
175
176
        self.assertEquals(hc.hit_count, 0)
176
 
        # if we try again it's still too new;
 
177
        # if we try again it's still too new; 
177
178
        self.assertEquals(hc.get_sha1('foo'), sha1('hello'))
178
179
        self.assertEquals(hc.miss_count, 2)
179
180
        self.assertEquals(hc.hit_count, 0)