From 07b69f55d4b8212ee6184dc544c38e48f924282f Mon Sep 17 00:00:00 2001
From: Prashanth Pai <ppai@redhat.com>
Date: Tue, 10 May 2016 11:39:46 +0530
Subject: Add missing middlewares to functest pipeline

Change-Id: I75fe4a12cf3ef5948efd63d78b95bca2e2b1437d
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Reviewed-on: http://review.gluster.org/14284
Reviewed-by: Thiago da Silva <thiago@redhat.com>
Tested-by: Thiago da Silva <thiago@redhat.com>
---
 test/functional/tests.py                           |  1 -
 .../functional_auth/gswauth/conf/proxy-server.conf | 43 ++++++++++++++++++----
 .../tempauth/conf/proxy-server.conf                | 43 ++++++++++++++++++----
 3 files changed, 70 insertions(+), 17 deletions(-)

(limited to 'test')

diff --git a/test/functional/tests.py b/test/functional/tests.py
index daa8897..9cb328d 100644
--- a/test/functional/tests.py
+++ b/test/functional/tests.py
@@ -2200,7 +2200,6 @@ class TestSlo(Base):
     set_up = False
 
     def setUp(self):
-	raise SkipTest("SLO not enabled yet in gluster-swift")
         super(TestSlo, self).setUp()
         if self.env.slo_enabled is False:
             raise SkipTest("SLO not enabled")
diff --git a/test/functional_auth/gswauth/conf/proxy-server.conf b/test/functional_auth/gswauth/conf/proxy-server.conf
index 0a3c1f6..695aa82 100644
--- a/test/functional_auth/gswauth/conf/proxy-server.conf
+++ b/test/functional_auth/gswauth/conf/proxy-server.conf
@@ -5,7 +5,7 @@ user = root
 workers = 1
 
 [pipeline:main]
-pipeline = catch_errors healthcheck proxy-logging cache tempurl gswauth proxy-logging proxy-server
+pipeline = catch_errors gatekeeper healthcheck proxy-logging cache bulk tempurl ratelimit crossdomain gswauth staticweb container-quotas account-quotas slo dlo proxy-logging proxy-server
 
 [app:proxy-server]
 use = egg:gluster_swift#proxy
@@ -53,24 +53,51 @@ put_queue_depth = 10
 auto_create_account_prefix = gs
 expiring_objects_account_name = expiring
 
+[filter:cache]
+use = egg:swift#memcache
+# Update this line to contain a comma separated list of memcache servers
+# shared by all nodes running the proxy-server service.
+memcache_servers = localhost:11211
+
 [filter:catch_errors]
 use = egg:swift#catch_errors
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [filter:proxy-logging]
 use = egg:swift#proxy_logging
 
-[filter:healthcheck]
-use = egg:swift#healthcheck
+[filter:bulk]
+use = egg:swift#bulk
 
-[filter:cache]
-use = egg:swift#memcache
-# Update this line to contain a comma separated list of memcache servers
-# shared by all nodes running the proxy-server service.
-memcache_servers = localhost:11211
+[filter:ratelimit]
+use = egg:swift#ratelimit
+
+[filter:crossdomain]
+use = egg:swift#crossdomain
+
+[filter:dlo]
+use = egg:swift#dlo
+
+[filter:slo]
+use = egg:swift#slo
 
 [filter:tempurl]
 use = egg:swift#tempurl
 
+[filter:staticweb]
+use = egg:swift#staticweb
+
+[filter:account-quotas]
+use = egg:swift#account_quotas
+
+[filter:container-quotas]
+use = egg:swift#container_quotas
+
+[filter:gatekeeper]
+use = egg:swift#gatekeeper
+
 [filter:gswauth]
 use = egg:gluster_swift#gswauth
 set log_name = gswauth
diff --git a/test/functional_auth/tempauth/conf/proxy-server.conf b/test/functional_auth/tempauth/conf/proxy-server.conf
index 554ce61..ea12afd 100644
--- a/test/functional_auth/tempauth/conf/proxy-server.conf
+++ b/test/functional_auth/tempauth/conf/proxy-server.conf
@@ -5,7 +5,7 @@ user = root
 workers = 1
 
 [pipeline:main]
-pipeline = catch_errors healthcheck proxy-logging cache tempurl tempauth proxy-logging proxy-server
+pipeline = catch_errors gatekeeper healthcheck proxy-logging cache bulk tempurl ratelimit crossdomain tempauth staticweb container-quotas account-quotas slo dlo proxy-logging proxy-server
 
 [app:proxy-server]
 use = egg:gluster_swift#proxy
@@ -53,24 +53,51 @@ put_queue_depth = 10
 auto_create_account_prefix = gs
 expiring_objects_account_name = expiring
 
+[filter:cache]
+use = egg:swift#memcache
+# Update this line to contain a comma separated list of memcache servers
+# shared by all nodes running the proxy-server service.
+memcache_servers = localhost:11211
+
 [filter:catch_errors]
 use = egg:swift#catch_errors
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [filter:proxy-logging]
 use = egg:swift#proxy_logging
 
-[filter:healthcheck]
-use = egg:swift#healthcheck
+[filter:bulk]
+use = egg:swift#bulk
 
-[filter:cache]
-use = egg:swift#memcache
-# Update this line to contain a comma separated list of memcache servers
-# shared by all nodes running the proxy-server service.
-memcache_servers = localhost:11211
+[filter:ratelimit]
+use = egg:swift#ratelimit
+
+[filter:crossdomain]
+use = egg:swift#crossdomain
+
+[filter:dlo]
+use = egg:swift#dlo
+
+[filter:slo]
+use = egg:swift#slo
 
 [filter:tempurl]
 use = egg:swift#tempurl
 
+[filter:staticweb]
+use = egg:swift#staticweb
+
+[filter:account-quotas]
+use = egg:swift#account_quotas
+
+[filter:container-quotas]
+use = egg:swift#container_quotas
+
+[filter:gatekeeper]
+use = egg:swift#gatekeeper
+
 [filter:tempauth]
 use = egg:swift#tempauth
 user_admin_admin = admin .admin .reseller_admin
-- 
cgit