ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-08 03:14:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_web: improve ETag tests, add If-None-Match test

Browse Source
This commit is contained in:
Brian Warner 2012-05-13 00:19:20 -07:00
parent 16eddc35e8
commit d437a9b33e
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/allmydata/test/common_web.py
View File

@ -61,7 +61,8 @@ class WebRenderingMixin:
class MyGetter(client.HTTPPageGetter):
handleStatus_206 = lambda self: self.handleStatus_200()
handleStatus_206 = lambda self: self.handleStatus_200() # PARTIAL_CONTENT
handleStatus_304 = lambda self: self.handleStatus_200() # NOT_MODIFIED
class HTTPClientHEADFactory(client.HTTPClientFactory):
protocol = MyGetter

27
src/allmydata/test/test_web.py
View File

@ -907,8 +907,11 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
d2 = _get_etag(uri, 'json')
d = defer.DeferredList([d1, d2], consumeErrors=True)
def _check(results):
assert all([r[0] for r in results]) # All deferred must succeed
assert results[0][1] + 'json' == results[1][1]
# All deferred must succeed
self.failUnless(all([r[0] for r in results]))
# the etag for the t=json form should be just like the etag
# fo the default t='' form, but with a 'json' suffix
self.failUnlessEqual(results[0][1] + 'json', results[1][1])
d.addCallback(_check)
return d
@ -918,7 +921,8 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
def _just_the_etag(result):
data, response, headers = result
etag = headers['etag'][0]
if uri.startswith('URI:DIR'): assert etag.startswith('DIR:')
if uri.startswith('URI:DIR'):
self.failUnless(etag.startswith('DIR:'), etag)
return etag
return d.addCallback(_just_the_etag)
@ -930,6 +934,23 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
# Check that etags work with immutable files
d.addCallback(lambda _: _check_etags(self._bar_txt_uri))
# use the ETag on GET
def _check_match(ign):
uri = "/uri/%s" % self._bar_txt_uri
d = self.GET(uri, return_response=True)
# extract the ETag
d.addCallback(lambda (data, code, headers):
headers['etag'][0])
# do a GET that's supposed to match the ETag
d.addCallback(lambda etag:
self.GET(uri, return_response=True,
headers={"If-None-Match": etag}))
# make sure it short-circuited (304 instead of 200)
d.addCallback(lambda (data, code, headers):
self.failUnlessEqual(int(code), http.NOT_MODIFIED))
return d
d.addCallback(_check_match)
return d
# TODO: version of this with a Unicode filename