From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Thu, 5 Apr 2018 17:06:16 +0000 (+0200)
Subject: qa: drop rfc2616 checking on civetweb
X-Git-Tag: v12.2.13~244^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40cfcb0765582c5bf6c4a86a72c6d23c729d5004;p=ceph.git

qa: drop rfc2616 checking on civetweb

Since newer versions of civetweb are also strict on rfc2616 checks let's enforce
strict rfc2616 checks in s3tests

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit f8ed817cccff626c0b63f776c0c5203989c348a1)

Conflicts:
	qa/tasks/s3tests.py: also lifecycle -> lifecycle_expiration
---

diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index 954983b8e2e..b66bcca8e09 100644
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -228,10 +228,8 @@ def run_tests(ctx, config):
     """
     assert isinstance(config, dict)
     testdir = teuthology.get_testdir(ctx)
-    attrs = ["!fails_on_rgw", "!lifecycle"]
-    # beast parser is strict about unreadable headers
-    if ctx.rgw.frontend == 'beast':
-        attrs.append("!fails_strict_rfc2616")
+    # civetweb > 1.8 && beast parsers are strict on rfc2616
+    attrs = ["!fails_on_rgw", "!lifecycle_expiration", "!fails_strict_rfc2616"]
     for client, client_config in config.iteritems():
         args = [
             'S3TEST_CONF={tdir}/archive/s3-tests.{client}.conf'.format(tdir=testdir, client=client),