Compare commits

...

2 commits

Author SHA1 Message Date
Andrew Schoen
49a1e295a9 Add fails_on_mod_proxy_fcgi to functional.test_s3.test_100_continue
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 9aef2c217997cf1f377353c20d110dcd2bd77fc1)
2015-03-04 15:24:36 -06:00
Yehuda Sadeh
992f2f169b s3tests: fix test_bucket_create_bad_contentlength_empty
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit a9dab59337)
2015-03-04 15:23:55 -06:00
2 changed files with 9 additions and 1 deletions

View file

@ -28,6 +28,8 @@ from . import (
s3, s3,
config, config,
get_prefix, get_prefix,
TargetConnection,
targets,
) )
@ -292,6 +294,7 @@ def test_object_create_bad_contentlength_empty():
@attr(method='put') @attr(method='put')
@attr(operation='create w/negative content length') @attr(operation='create w/negative content length')
@attr(assertion='fails 400') @attr(assertion='fails 400')
@attr('fails_on_mod_proxy_fcgi')
@nose.with_setup(teardown=_clear_custom_headers) @nose.with_setup(teardown=_clear_custom_headers)
def test_object_create_bad_contentlength_negative(): def test_object_create_bad_contentlength_negative():
key = _setup_bad_object({'Content-Length': -1}) key = _setup_bad_object({'Content-Length': -1})
@ -318,6 +321,7 @@ def test_object_create_bad_contentlength_none():
@attr(method='put') @attr(method='put')
@attr(operation='create w/non-graphic content length') @attr(operation='create w/non-graphic content length')
@attr(assertion='fails 400') @attr(assertion='fails 400')
@attr('fails_on_mod_proxy_fcgi')
@nose.with_setup(teardown=_clear_custom_headers) @nose.with_setup(teardown=_clear_custom_headers)
def test_object_create_bad_contentlength_unreadable(): def test_object_create_bad_contentlength_unreadable():
key = _setup_bad_object({'Content-Length': '\x07'}) key = _setup_bad_object({'Content-Length': '\x07'})
@ -707,7 +711,7 @@ def _create_new_connection():
host=main.host, host=main.host,
calling_format=main.calling_format, calling_format=main.calling_format,
) )
return conn return TargetConnection(targets.main.default.conf, conn)
@attr(resource='bucket') @attr(resource='bucket')
@attr(method='put') @attr(method='put')
@ -729,6 +733,7 @@ def test_bucket_create_bad_contentlength_empty():
@attr(method='put') @attr(method='put')
@attr(operation='create w/negative content length') @attr(operation='create w/negative content length')
@attr(assertion='fails 400') @attr(assertion='fails 400')
@attr('fails_on_mod_proxy_fcgi')
@nose.with_setup(teardown=_clear_custom_headers) @nose.with_setup(teardown=_clear_custom_headers)
def test_bucket_create_bad_contentlength_negative(): def test_bucket_create_bad_contentlength_negative():
_add_custom_headers({'Content-Length': -1}) _add_custom_headers({'Content-Length': -1})
@ -751,6 +756,7 @@ def test_bucket_create_bad_contentlength_none():
@attr(method='put') @attr(method='put')
@attr(operation='create w/non-graphic content length') @attr(operation='create w/non-graphic content length')
@attr(assertion='fails 400') @attr(assertion='fails 400')
@attr('fails_on_mod_proxy_fcgi')
@nose.with_setup(teardown=_clear_custom_headers) @nose.with_setup(teardown=_clear_custom_headers)
def test_bucket_create_bad_contentlength_unreadable(): def test_bucket_create_bad_contentlength_unreadable():
_add_custom_headers({'Content-Length': '\x07'}) _add_custom_headers({'Content-Length': '\x07'})

View file

@ -4240,6 +4240,8 @@ def _simple_http_req_100_cont(host, port, is_secure, method, resource):
@attr(method='put') @attr(method='put')
@attr(operation='w/expect continue') @attr(operation='w/expect continue')
@attr(assertion='succeeds if object is public-read-write') @attr(assertion='succeeds if object is public-read-write')
@attr('100_continue')
@attr('fails_on_mod_proxy_fcgi')
def test_100_continue(): def test_100_continue():
bucket = get_new_bucket() bucket = get_new_bucket()
objname = 'testobj' objname = 'testobj'