From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 17 Jun 2015 20:30:32 +0000 (-0700)
Subject: Merge pull request #61 from andrewgaul/range-get-content-range
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f01ec62a67e787cf79153b451c13be5ac0ac27f2;p=s3-tests.git

Merge pull request #61 from andrewgaul/range-get-content-range

Test Content-Range header in range requests

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
---

f01ec62a67e787cf79153b451c13be5ac0ac27f2
diff --cc s3tests/functional/test_s3.py
index 9fce6b8f,e3b0ea20..911b193e
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@@ -5395,23 -5400,8 +5400,24 @@@ def test_ranged_request_return_trailing
  
      eq(fetched_content, content[-7:])
      eq(status, 206)
+     eq(content_range, 'bytes 4-10/11')
  
 +@attr(resource='object')
 +@attr(method='get')
 +@attr(operation='range')
 +@attr(assertion='returns invalid range, 416')
 +def test_ranged_request_invalid_range():
 +    content = 'testcontent'
 +
 +    bucket = get_new_bucket()
 +    key = bucket.new_key('testobj')
 +    key.set_contents_from_string(content)
 +
 +    # test invalid range
 +    e = assert_raises(boto.exception.S3ResponseError, key.open, 'r', headers={'Range': 'bytes=40-50'})
 +    eq(e.status, 416)
 +    eq(e.error_code, 'InvalidRange')
 +
  def check_can_test_multiregion():
      if not targets.main.master or len(targets.main.secondaries) == 0:
          raise SkipTest