s3tests: fix test_bucket_create_bad_contentlength_empty

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

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

diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py
index 188257d35348ae0319b3ab873313d7d445fd35ba..aec6497f51d8d87141294b842c84d767492fe124 100644 (file)
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@ -4561,6 +4561,7 @@ def _simple_http_req_100_cont(host, port, is_secure, method, resource):
 @attr(method='put')
 @attr(operation='w/expect continue')
 @attr(assertion='succeeds if object is public-read-write')
+@attr('100_continue')
 def test_100_continue():
     bucket = get_new_bucket()
     objname = 'testobj'