Commit graph

387 commits

Author SHA1 Message Date
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
Robin H. Johnson
6ce34d3c6a website: RGW does not have custom 404 message descriptions per s3 error codes yet.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
17f98b00ba website: Use better test annotation for routingrules tests.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
9efbe4ef81 website: Support both NoSuchWebsiteConfiguration and NoSuchKey for fetching the website config subresource.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
e917e5e41a s3website: Allow tests to be skipped if website support disabled in RGW.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
eb8acbaf92 Fix whitespace.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
44e51960c6 Annotate many tests that fail on AWS (tested on EU region)
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
88b6328003 website: Improve XML handling and x-amz-website-redirect-location tests
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
e0655234b1 Lots of tests, that pass on AmazonS3 unless the phase of the moon is wrong. There is a non-trivial degree of lag in S3 applying WebsiteConfiguration changes sometimes, eu-west-1 was taking 20+ seconds during part of the last day. Compounded by the Amazon eventual-consistency made developing these tests difficult at times.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
819eecba5c Work on tests.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
5d158567fd Update redirect checks for x-amz-website-redirect-location
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
c1f7ad54ce Use new XML checks.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
4d8c6bdb69 Add XML improvements.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
672e0ad0e4 Improve test attribute.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
ddfcf59e53 Add tests for x-amz-website-redirect-location, code still pending.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
25e9980af8 website: refactor and add redirect testcases, so far 3 failures out of 27 new tests.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
c053a96ef2 Fixup path stuff for redirect test.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
5c681dacff Prepare for better testcases, with fixture functions.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
a9fd9988e1 website: Clean up imports.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
4c07c555ee website: Start redirect tests.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
ea69111773 website: improve test structure.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
cb1e14ae16 website: bucket-level tests (indexdoc, errordoc)
This adds tests for the new S3 Website code under development at on the
wip-static-website-robbat2-master branch (see the robbat2 fork).

The ErrorDoc tests with a valid uploaded ErrorDoc show that my existing
code fails as expected :-). All other IndexDoc cases pass already.

It would be nice to refactor some of this set of tests and extract
common code, because the only variation in some of them is the ACLs on a
single file.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
a48a8983b7 refactor out _make_request and _make_bucket_request, with a common _make_raw_request; ready for s3website testing.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Robin H. Johnson
3cf86161d0 Use py3 print.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-20 16:08:57 -07:00
Yuan Zhou
22edd83083 gevent: bump to >=1.0
There are some DNS resolving issue on 0.13.6.
Bumping to >=1.0 fixes the issues for me.

Fixes: #13885

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2016-04-11 16:01:34 +08:00
Javier M. Mellid
e7241f2ff1 Add fails_on_rgw on multipart copy part tests
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2016-03-28 09:19:27 +00:00
Yehuda Sadeh
278113fbc5 rgw: add a few tests that check for null object versioning behavior
Deals with ceph issue #15243

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-22 18:40:39 -07:00
Javier M. Mellid
11bb947a0b rgw: add X-Amz-Expires test cases
Test X-Amz-Expires under AWS4 auth.

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2016-01-27 02:19:20 +00:00
Yehuda Sadeh
a13f6441ae Merge pull request #89 from andrewgaul/atomic-multipart-upload
Test begin to overwrite file with MPU then abort

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-18 12:25:59 -08:00
Andrew Gaul
c788b7d0cd Test begin to overwrite file with MPU then abort
Signed-off-by: Andrew Gaul <andrew@gaul.org>
2015-12-18 12:16:59 -08:00
Robin H. Johnson
d98d7956c1 Improve proxy error support: "Bad Request" case
If you are run the S3 testsuite against a reverse proxy (eg haproxy)
rather than RGW directly, some of the tests will return errors from the
proxy, rather than haproxy itself.

Some proxies differ from RGW in the exact case of 'Bad Request', so do
the match in a case-insensitive manner. Haproxy for example returns 'Bad
request'.

This removes the need for some of the prior fails_on_dho test tags, as
the failure was due to haproxy.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2015-12-18 11:50:11 -08:00
Yehuda Sadeh
a85b279bdc Merge pull request #88 from andrewgaul/head-zero-bytes
Add test for HEAD of a zero-byte object

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-18 09:57:19 -08:00
Yehuda Sadeh
958a718558 Merge pull request #87 from dreamhost/wip-cleanup-buckets
s3tests: do not exit cleanup after first bucket!

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-18 09:56:36 -08:00
Yehuda Sadeh
b00d8b3653 Merge pull request #85 from dreamhost/wip-test-issue11563
Add test for COPY Content-Type header

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-18 09:56:02 -08:00
Yehuda Sadeh
f33c3e2432 Merge pull request #83 from andrewgaul/list-objects-public-read-bucket
Anonymously list private and public-read buckets

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-18 09:54:46 -08:00
Yehuda Sadeh
44f2ce8281 Merge pull request #77 from andrewgaul/special-key-names
Consolidate test_object_create_special_characters

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-18 09:52:58 -08:00
Yehuda Sadeh
86c311b0d1 Merge pull request #73 from andrewgaul/ends-with-delimiter
Test listing a blob which ends with delimiter

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-18 09:51:03 -08:00
Yehuda Sadeh
2c9501f547 Merge pull request #49 from andrewgaul/copy-bucket-key-not-found
Copy tests for non-existent buckets and keys

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-18 09:50:20 -08:00
Yehuda Sadeh
2851e0c214 Merge pull request #30 from andrewgaul/bucket-create-exists
Handle idempotent and BucketAlreadyOwnedByYou

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-18 09:49:10 -08:00
Javier M. Mellid
914b0f36c1 rgw: add AWS4 auth testing support
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2015-12-18 00:22:11 +01:00
Andrew Gaul
7ac3a4008a Add test for HEAD of a zero-byte object
Signed-off-by: Andrew Gaul <andrew@gaul.org>
2015-12-15 00:16:06 -08:00
Robin H. Johnson
de65c582b7 s3tests: do not exit cleanup after first bucket!
Bucket cleanup code was exiting after the first succesful bucket
removed, instead of cleaning up all buckets. This left many buckets
behind over time, causing large slowdowns of the test suite.

This was introduced in commit c41ebab9cf,
when changes for versioned files were added.

Signed-off-by: Kobi Laredo <kobi.laredo@dreamhost.com>
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Backport: hammer
2015-12-01 17:28:23 -08:00
Javier M. Mellid
84067cb17c s3tests: Check content is correct on copy multipart
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2015-11-25 15:50:18 +01:00
Robin H. Johnson
703f63e060 Add test for COPY Content-Type header
Issue #11563 deals with the COPY command breaking the Content-Type
header. Add a test case for this to ensure it remains fixed.

Reference: http://tracker.ceph.com/issues/11563
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2015-11-12 22:09:05 -08:00
Yehuda Sadeh
017354ae07 Merge pull request #76 from jmunhoz/test-requestid-on-error
Test RequestId on error

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-10-29 08:38:31 -07:00
Javier M. Mellid
6ca9492797 s3tests: Add test_object_requestid_matchs_header_on_error
Error responses' RequestId must match header's x-amz-request-id value.

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2015-10-29 00:12:51 +01:00
Javier M. Mellid
63048b7bdf s3tests: Add test_object_requestid_on_error
Error responses must contains a RequestId tag. This is the ID of the
request associated with the error.

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2015-10-28 23:55:45 +01:00