Merge "Insert versioned_writes in correct pipeline position"

openstack/swift

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2016年02月09日 21:59:17 +00:00

committed by Gerrit Code Review

parent b140d7d8b8 30d74af653

commit 45a7a15674

2 changed files with 40 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
swift/proxy/server.py

View File

@@ -67,7 +67,7 @@ required_filters = [

'staticweb', 'tempauth', 'keystoneauth',

'catch_errors', 'gatekeeper', 'proxy_logging']},

{'name': 'versioned_writes', 'after_fn': lambda _junk: [

'staticweb', 'tempauth', 'keystoneauth',

'slo', 'dlo', 'staticweb', 'tempauth', 'keystoneauth',

'catch_errors', 'gatekeeper', 'proxy_logging']}]

39
test/unit/common/test_wsgi.py

View File

@@ -1470,6 +1470,45 @@ class TestPipelineModification(unittest.TestCase):

'swift.common.middleware.healthcheck',

'swift.proxy.server'])

def test_proxy_modify_wsgi_pipeline_inserts_versioned_writes(self):

config = """

[DEFAULT]

swift_dir = TEMPDIR

[pipeline:main]

pipeline = slo dlo healthcheck proxy-server

[app:proxy-server]

use = egg:swift#proxy

conn_timeout = 0.2

[filter:healthcheck]

use = egg:swift#healthcheck

[filter:dlo]

use = egg:swift#dlo

[filter:slo]

use = egg:swift#slo

"""

contents = dedent(config)

with temptree(['proxy-server.conf']) as t:

conf_file = os.path.join(t, 'proxy-server.conf')

with open(conf_file, 'w') as f:

f.write(contents.replace('TEMPDIR', t))

_fake_rings(t)

app = wsgi.loadapp(conf_file, global_conf={})

self.assertEqual(self.pipeline_modules(app),

['swift.common.middleware.catch_errors',

'swift.common.middleware.gatekeeper',

'swift.common.middleware.slo',

'swift.common.middleware.dlo',

'swift.common.middleware.versioned_writes',

'swift.common.middleware.healthcheck',

'swift.proxy.server'])

def test_proxy_modify_wsgi_pipeline_ordering(self):

config = """

[DEFAULT]