From: Yehuda Sadeh Date: Fri, 6 Jul 2012 21:44:22 +0000 (-0700) Subject: test_s3: remove extra code block X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51450253a2822872bd15c05b595004e3a22b0298;p=s3-tests.git test_s3: remove extra code block Code was duplicated by mistake. Removing it. Signed-off-by: Yehuda Sadeh --- diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py index 4af99a09..7721854c 100644 --- a/s3tests/functional/test_s3.py +++ b/s3tests/functional/test_s3.py @@ -1063,31 +1063,6 @@ def _make_request(method, bucket, key, body=None, authenticated=False): print res.status, res.reason return res -def _make_request(method, bucket, key, body=None, authenticated=False): - """ - issue a request for a specified method, on a specified , - with a specified (optional) body (encrypted per the connection), and - return the response (status, reason) - """ - if authenticated: - url = key.generate_url(100000, method=method) - o = urlparse(url) - path = o.path + '?' + o.query - else: - path = '/{bucket}/{obj}'.format(bucket=key.bucket.name, obj=key.name) - - if s3.main.is_secure: - class_ = HTTPSConnection - else: - class_ = HTTPConnection - - c = class_(s3.main.host, s3.main.port, strict=True) - c.request(method, path, body=body) - res = c.getresponse() - - print res.status, res.reason - return res - def _make_bucket_request(method, bucket, body=None, authenticated=False): """ issue a request for a specified method, on a specified ,