Commit graph

535 commits

Author SHA1 Message Date
Abhishek Lekshmanan
35cd3f77af policy: test put obj using copy conditionals
Test s3:x-amz-copy-source conditional on put obj with x-amz-copy-source

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-17 10:56:32 +01:00
Abhishek Lekshmanan
1012710ce7 policy: test for acl grants conditionals on put bucket acls
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-17 10:56:32 +01:00
Abhishek Lekshmanan
006f9d5f46 policy: add tests for put bucket acl with canned acl conditionals
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-17 10:56:31 +01:00
Abhishek Lekshmanan
b1e1ba0edf s3: policy tests for ListBucket with prefix, delimiter & max-keys
Allow conditionals on ListBucket similar to s3 docs which allow for
these clauses

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-17 10:56:31 +01:00
Abhishek Lekshmanan
3e650c5e6e policy: test put object tagging with conditionals
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-17 10:56:31 +01:00
Abhishek Lekshmanan
3511eabc5c policy: test get object tagging with conditionals
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-17 10:56:26 +01:00
Abhishek Lekshmanan
5167af2e73 add policy tests for get object with conditionals
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-17 10:55:02 +01:00
Abhishek Lekshmanan
5ae2337747 add bucket-policy attr to all the policy tests
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-17 10:52:49 +01:00
Abhishek Lekshmanan
fe35325ab8 test_s3: modify make_json_policy to support conditionals
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-17 10:52:49 +01:00
Abhishek Lekshmanan
eee2d9a82c bucket policy: improve the helper functions used for tagging upwards
- Improve `make_json_policy` to support conditionals in policy
- Move the helper functions for creating policies up so that bucket
  policy tests can use these
- add bucket-policy attribute to the tagging tests using policy

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-17 10:52:49 +01:00
Matt Benjamin
f5ad2bfaee Add test case for POST with no Content-Type header
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-12-20 16:55:39 -05:00
Xinying Song
9506ac220f Add test case for getting version-id when upload objects to bucket
For default-bucket and versioning-suspended-bucket, no version-id should return when upload.
For versioning-enabled-bucket, an non-empty version-id should return and equal to what
bucket list shows.

Signed-off-by: Xinying Song <songxinying@cloudin.cn>
2017-11-22 09:26:13 +08:00
Casey Bodley
92c4ac5a59
Merge pull request #196 from ZVampirEM77/wip-lc-typos
Fix a typos for lifecycle test case

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-11-09 09:02:57 -05:00
Enming Zhang
52d9c955df cleanup unneeded comments
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
2017-11-07 21:23:04 +08:00
Enming Zhang
19176daaf9 Fix a typos for lifecycle test case
According to the commit 9204283def,
lc debug interval should be set to 10s.

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
2017-11-07 21:23:04 +08:00
Vasu Kulkarni
e208a74a05 check for either 400 or 416 response code for invalid range test
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-11-06 11:35:32 -08:00
Yehuda Sadeh
5138dd451d Merge pull request #189 from joke-lee/list_bucket_versiong_with_marker
test for https://github.com/ceph/ceph/pull/17934

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-10-26 09:40:40 -07:00
yuliyang
2521183646 rgw: test cors option request with Access-Control-Request-Headers
test for https://github.com/ceph/ceph/pull/18556

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
2017-10-26 21:46:28 +08:00
Casey Bodley
42debb8be7 expect 400 for missing sse headers
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-10-10 13:49:37 -04:00
Yehuda Sadeh
a2a383e77f Merge pull request #171 from cbodley/wip-amz-date-precedence
check precedence of Date and X-Amz-Date in signatures

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-09-25 19:15:07 +03:00
yuliyang
f464a5a3b1 test for https://github.com/ceph/ceph/pull/17934
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
2017-09-24 11:56:36 +08:00
Yehuda Sadeh
0826df92d2 Merge pull request #186 from tipabu/check-grant-ordering
Care less about ordering when checking grants

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-09-20 11:55:52 +03:00
Yehuda Sadeh
94d5be6ace Merge pull request #185 from theanalyst/lc-time-fixes
lc: Give more flexibility for LC expiration times

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-09-19 12:57:33 +03:00
Tim Burke
301272c0ef Care less about ordering when checking grants
Some tests, like test_object_header_acl_grants and
test_bucket_header_acl_grants, use the same id for all permissions.
Sort() is stable, so those tests end up testing the order of acl grants
returned by Boto. Not sure, but I think this may in turn depend on the
order of HTTP headers, where the order is not significant.

Signed-off-by: Tim Burke <tim.burke@gmail.com>
2017-09-12 13:24:00 -06:00
Abhishek Lekshmanan
9204283def lc: Give more flexibility for LC expiration times
Earlier values expected a lc debug interval of 2s, which is a pretty
short time window and can often lead to failures if the processing
didn't complete within the next day. This commit assumes the currently
configured LC debug interval of 10s, and gives time intervals using the
following logic:

Worst case:
LC start-time : 00:00
obj upload    : 00:01
LC run1       : 00:10 -> object not expired as it is only 9s old
LC run2       : 00:20 -> object will expire in this run, however we
can't exactly guess when this run will complete, for a moderate amount
of objects this can take anywhere between 1 to a max of 10s, let us give
it a wiggle room to complete around 8s, given the amount of objects in a
teuthology run, it should be mostly probable that the object is already
deleted within this time, so at 28s, we should have seen day1 objects being
expired.

Best case:
LC start-time: 00:00
obj upload : 00:09
LC run1 : 00:10
LC run2 : 00:20 -> obj expires, so elapsed time is around 11->19s (of
course it would almost close to 10s too), We should probably configure
the LC lock time to 10s as well just so as to ensure that the lock isn't
held for the default 60s in which case it is possible that the object
might expire in a time greater than the lock interval.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-09-07 11:50:00 +02:00
hechuang
1ca6a94e6a modify test_sse_kms_method_head() for aws standard
Signed-off-by: hechuang <hechuang@xsky.com>
2017-08-17 12:07:41 +08:00
hechuang
b554973239 add test_sse_kms_read_declare() for aws standard
Signed-off-by: hechuang <hechuang@xsky.com>
2017-08-17 12:07:06 +08:00
hechuang
58944d0ba6 rgw: Data encryption is not follow the AWS agreement
Encryption request headers should not be sent for GET requests and HEAD
requests if your object uses SSE-KMS/SSE-S3 or you’ll get an HTTP 400
BadRequest error.

Signed-off-by: hechuang <hechuang@xsky.com>
2017-08-17 12:04:53 +08:00
Andrew Gaul
a1b139c608 Add missing versioning tag
Signed-off-by: Andrew Gaul <andrew@gaul.org>
2017-08-16 14:08:58 -07:00
Yehuda Sadeh
425d209989 Merge pull request #179 from andrewgaul/copy-part-invalid-range
Add test for invalid copy part range

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-08-16 09:36:07 -07:00
Yehuda Sadeh
4ff6b044c2 Merge pull request #181 from theanalyst/lc-expir-disable
lc: set attribute as lifecycle_time for lc tests using timing ops

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-08-15 08:43:53 -07:00
Abhishek Lekshmanan
edeb956a82 lc: add attr lifecycle_expiration for lc tests using expiration
Allows us to additionally filter out these tests which currently fail in
the teuthology runs

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-08-15 10:42:00 +02:00
Abhishek Lekshmanan
cc2d6f076f lifecycle: add test cases using filter & no id
Added test cases for LC policies with no ID in xml, no prefix and an
empty and non empty Filter.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-08-11 13:52:21 +02:00
Andrew Gaul
b068a07301 Add test for invalid copy part range
References kahing/goofys#212.

Signed-off-by: Andrew Gaul <andrew@gaul.org>
2017-08-01 19:03:31 -07:00
Abhishek Lekshmanan
6086420b4b add tests for get/put/delete/post object tagging
- adds test for put obj with tagging query
- adds test for HEAD obj with x-amz-tagging-count verification
- adds test for put object tagging
- adds test for get object tagging
- adds test for post object tagging
- adds test for delete object tagging
- also verify& exceed the max tags
- add tagging condition to bucket acl

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-07-25 10:51:29 +02:00
yuliyang
d0dfee8ef1 add test case: test set policy with condition operator end with IfExists
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
2017-07-08 07:27:04 +08:00
Yehuda Sadeh
0b45914f40 Merge pull request #174 from ceph/wip-underscore-prefix
Add test for bucket list with prefix with underscore

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-07-07 14:04:43 -07:00
Yehuda Sadeh
a872170316 Merge pull request #170 from zhangsw/lifecycle-date
add test case for lifecycle expiration date.

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2017-07-07 13:59:34 -07:00
Yehuda Sadeh
d801534f99 Merge pull request #168 from zhangsw/lifecycle-expiration
modify the thread sleep time in lifecycle expiration test so that it can pass on ceph master branch.

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2017-07-07 13:58:55 -07:00
Yehuda Sadeh
ed701f0c65 Merge pull request #163 from pritha-srivastava/wip-rgw-bucket-policy-tests
rgw: Adding tests for Bucket Policy.

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2017-07-07 13:56:25 -07:00
Orit Wasserman
1e2e60bd6c Add test for bucket list with prefix with underscore
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2017-07-06 15:30:52 +03:00
Casey Bodley
a2f73f6a84 check precedence of Date and X-Amz-Date in signatures
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-06-21 10:19:12 -04:00
Zhang Shaowen
bba1b44d7b modify the thread sleep time in lifecycle expiration test so that it can
pass on ceph master branch.

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
2017-06-20 16:32:24 +08:00
Zhang Shaowen
fe7d69cabc add test case for lifecycle expiration date.
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
2017-06-20 16:07:03 +08:00
Casey Bodley
a358a840b6 clear key.version_id now that GET requests return x-amz-version-id header
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-06-14 13:42:57 -04:00
Pritha Srivastava
cd50db0260 rgw: Adding tests for Bucket Policy.
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
2017-06-09 19:58:51 +05:30
Yehuda Sadeh
d91b9c43a5 Merge pull request #157 from zhangsw/verionid-getobjectmeta
Add test case for getting version id when getting object and object's metadata

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-06-06 14:25:10 -07:00
Zhang Shaowen
113e6f9bf6 Test case for non-current expiration, multipart upload expiration and
delete marker expiration.

Fixes: http://tracker.ceph.com/issues/19519

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
2017-05-04 15:57:46 +08:00
Zhang Shaowen
04ecc85d33 Add test case for getting version id when getting object and object's metadata
Fixes: http://tracker.ceph.com/issues/19565

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
2017-04-10 17:58:26 +08:00
Casey Bodley
e49cf3ddab crypto: add key headers to valid HEAD requests
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-03-28 10:03:59 -04:00
Adam Kupczyk
b27ddae9c4 Added tests for HEAD method for encrypted objects.
Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
2017-03-28 10:03:59 -04:00
Adam Kupczyk
05543b85b1 Modified aws kms tests to use config variable kms_keyid
Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
2017-03-28 10:03:59 -04:00
Adam Kupczyk
33deec9a77 A bit more test for kms
Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
2017-03-28 10:03:55 -04:00
Adam Kupczyk
f8761f855b Additional tests for server side encryption, S3 SSE-KMS mode.
All tests belong to group 'encryption'.

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
2017-03-10 15:15:26 -05:00
Adam Kupczyk
d92031ef16 Additional tests for server side encryption, S3 SSE-C mode.
All tests belong to group 'encryption'.

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
2017-03-10 15:15:24 -05:00
Yehuda Sadeh
4eec3bebc7 Merge pull request #136 from jkorvin/fix-ifmodifiedsince-failed
Fix 'If-Modified-Since' format string

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-03-07 13:47:44 -08:00
Yehuda Sadeh
297f3d9c8c Merge pull request #135 from jkorvin/fix
Fix If-Match test

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-03-07 13:46:16 -08:00
Evgenii Gorinov
217f0d520f Fix 'If-Modified-Since' format string
According to https://tools.ietf.org/html/rfc7232
header 'If-Modified-Since' should be a correct HTTP-date.
For example: `Tue, 15 Nov 1994 12:45:26 GMT`;
not `1994-11-15T12:45:26.000Z`.

Signed-off-by: Evgenii Gorinov <korvin.lucky@gmail.com>
2017-03-07 23:04:41 +03:00
Evgenii Gorinov
73fb771553 Fix If-Match test
According to https://tools.ietf.org/html/rfc7232, If-Match field should looks like QUOTES ETag QUOTES.

Signed-off-by: Evgenii Gorinov <korvin.lucky@gmail.com>
2017-03-07 23:00:09 +03:00
Yehuda Sadeh
ed691169c5 Merge pull request #152 from zhangsw/set-current-acl
Add a test case for setting acl on object with no version id specified.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-03-07 11:48:39 -08:00
Zhang Shaowen
d6435f4f5f Add a test case for setting acl on object with no version id specified.
Fixes: http://tracker.ceph.com/issues/18923

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
2017-02-14 16:16:51 +08:00
Zhang Shaowen
fba689ac1e add lifecycle validate test cases.
Fixes: http://tracker.ceph.com/issues/18541
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
2017-01-17 10:50:28 +08:00
Orit Wasserman
e856cbcee6 test multi-delete with object with ending underscore
Fixes: http://tracker.ceph.com/issues/18023
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-12-01 11:03:52 +01:00
Yehuda Sadeh
f2d087ed8a rgw: adjust tests annotations
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-11-02 11:52:16 -07:00
Yehuda Sadeh
39db936348 Merge pull request #133 from ceph/wip-more-multipart-copy
more multipart copy tests
2016-11-02 11:45:06 -07:00
Yehuda Sadeh
26b505a12d Merge pull request #132 from ceph/wip-17635
add a test for post object with empty conditions
2016-11-02 11:44:54 -07:00
Yehuda Sadeh
3641923f23 Merge pull request #130 from ceph/wip-aws2-aws4
rgw: skip aws2 requests when testing aws4
2016-11-02 11:44:37 -07:00
Yehuda Sadeh
f135d2fc1a Merge pull request #129 from ceph/wip-16930
Wip 16930
2016-11-02 11:44:28 -07:00
Yehuda Sadeh
7139293aa0 Merge pull request #117 from tianshan/fix-rgw-roundtrip
fix rgw_roundtrip test fail

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-11-02 11:43:55 -07:00
Yehuda Sadeh
9a2e9bbd02 fix broken test
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-11-01 16:09:09 -07:00
Yehuda Sadeh
634d96f5c6 add a test for post object with empty conditions
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-10-20 12:21:46 -07:00
Yehuda Sadeh
b9aab7cb1c more multipart copy tests
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-10-20 11:46:40 -07:00
Orit Wasserman
14da8e5b9d test set_acl for keys with special characters
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-10-20 12:11:08 +02:00
Yehuda Sadeh
e6a6ec1cd9 test concurrent bucket set acl
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-10-04 15:37:43 -07:00
Yehuda Sadeh
5bc2f21564 Merge pull request #124 from tipabu/complete-multipart
Complete multi-part upload during dry-run

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-10-04 09:56:17 -07:00
Tim Burke
316a814b59 Complete multi-part upload during dry-run
While it may be valuable to verify that deleting a non-existent key
is OK, that doesn't seem to be the point of this test.

Signed-off-by: Tim Burke <tim.burke@gmail.com>
2016-09-30 17:00:57 -07:00
Yehuda Sadeh
05f11d4c32 Merge pull request #127 from ceph/fix_copy_obj_versioned_bucket
Fix copy obj versioned bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-09-29 19:05:54 -07:00
Yehuda Sadeh
7d716a656d rgw: skip aws2 requests when testing aws4
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-09-29 13:34:22 -07:00
Daniel Gryniewicz
e33a2f6fb9 S3 lifecycle tests
Test S3 lifecycle expiration.  This requires the test harnass code in
RGW to make sure it doesn't take days so expire anything.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2016-09-26 13:34:44 -04:00
Orit Wasserman
c62e264e89 test copy object on a multipart object
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-09-16 11:41:52 +02:00
Orit Wasserman
7a437905f2 fix test_object_copy_versioned_bucket
Do not use _create_key_with_random_content as it creates a new bucket.
Check objects content and size

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-09-14 14:23:49 +02:00
Yehuda Sadeh
6ca6f7c70e Merge pull request #125 from ceph/versioned_copy_obj
Add testing for copy object to/from a versioned bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-09-14 03:45:10 -07:00
Orit Wasserman
c961cdd10e Add testing for copy object to/from a versioned bucket
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-09-14 12:31:07 +02:00
Yehuda Sadeh
4e530d396f Merge pull request #123 from ceph/get_special_key
test get object with special key name

Reviewed-by: Andrew Gaul <andrew@gaul.org>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-09-14 03:00:33 -07:00
Orit Wasserman
29caf70ccd test get object with special key name
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-09-06 10:00:56 +02:00
Orit Wasserman
21ade20826 Add range request to an empty object
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-07-22 14:49:21 +02:00
Tianshan Qu
6dcec183a3 fix rgw_roundtrip test fail
boto no longer rewind itself in set_contents_from_file, which will trigger the assert in
realistic/RandomContentFile::seek

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
2016-07-04 19:13:14 +08:00
Andrew Gaul
e29168f8b9 Annotate tests which create non-RFC2616 headers
Signed-off-by: Andrew Gaul <andrew@gaul.org>
2016-06-06 16:30:26 -07:00
Javier M. Mellid
520eaa0b62 rgw: aws4: fix test_object_create_missing_signed_header_aws4
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2016-06-02 21:32:00 +00:00
Javier M. Mellid
ff9fb2d8ea rgw: aws4: fix test_object_create_missing_signed_custom_header_aws4
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2016-06-02 21:08:41 +00:00
Yehuda Sadeh
45a4b336cc Merge pull request #110 from ceph/wip-15886
rgw: add a new multipart test

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-05-20 16:24:02 -07:00
Yehuda Sadeh
6154f37036 Merge pull request #109 from wido/origin-wildcard-test
Add test to verify if Asterisk Origin is returned when * is set as a …

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-17 16:19:33 -07:00
Yehuda Sadeh
14d58a3bda Merge remote-tracking branch 'dreamhost/wip-static-website'
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

Conflicts:
	s3tests/functional/test_s3.py
2016-05-17 16:00:12 -07:00
Yehuda Sadeh
99f237e552 s3tests: modify test_get_object_ifmodifiedsince_failed
Use key's last_modified instead of local time

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-17 15:46:27 -07:00
Yehuda Sadeh
3e3eb4908d Merge pull request #74 from andrewgaul/conditional-get
Add tests for conditional gets

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-17 10:12:57 -07:00
Yehuda Sadeh
e71c84f328 rgw: add a new multipart test
test for the following ceph issue:
http://tracker.ceph.com/issues/15886

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-16 14:44:54 -07:00
Robin H. Johnson
811e7f6d7e s3website: Refactor strings & aid debugging
Refactor duplicated static sites template content, and include a debug copy of
the WebsiteConf XML in every bucket for ease of debug with the test generator.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-04-21 15:10:15 -07:00
Robin H. Johnson
8da96c83af functional._make_request: go back to simple version of httplib.request.
The httplib.request function automatically constructs the following
headers:
content-length, host, accept-encoding

Until such time as we need to override those values in incompatible
ways, simply use it.

Fixes: https://github.com/ceph/s3-tests/pull/92#issuecomment-185970260
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
94fa405270 Refactor _make_bucket_request.
s3tests.functional._make_bucket_request is now a special case of
_make_request, as requested by
https://github.com/ceph/s3-tests/pull/92#commitcomment-15775972

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
f028e1e926 website: include Forbidden in 403 test per 802c8a3ee9 (commitcomment-15776266).
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00