Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup flask paths with trailing slashes.

Browse Source
This commit is contained in:
Steve Pulec 2016-01-24 17:13:32 -05:00
parent a7938ed9ec
commit eba9033cc9
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/core/utils.py
View File

@ -74,6 +74,10 @@ def convert_regex_to_flask_path(url_path):
return '<regex("{0}"):{1}>'.format(match_pattern, match_name) return '<regex("{0}"):{1}>'.format(match_pattern, match_name)
url_path = re.sub("\(\?P<(.*?)>(.*?)\)", caller, url_path) url_path = re.sub("\(\?P<(.*?)>(.*?)\)", caller, url_path)
if url_path.endswith("/?"):
# Flask does own handling of trailing slashes
url_path = url_path.rstrip("/?")
return url_path return url_path

16
tests/test_s3bucket_path/test_bucket_path_server.py
View File

@ -21,23 +21,23 @@ def test_s3_server_bucket_create():
backend = server.create_backend_app("s3bucket_path") backend = server.create_backend_app("s3bucket_path")
test_client = backend.test_client() test_client = backend.test_client()
res = test_client.put('/foobar/', 'http://localhost:5000') res = test_client.put('/foobar', 'http://localhost:5000')
res.status_code.should.equal(200) res.status_code.should.equal(200)
res = test_client.get('/') res = test_client.get('/')
res.data.should.contain(b'<Name>foobar</Name>') res.data.should.contain(b'<Name>foobar</Name>')
res = test_client.get('/foobar/', 'http://localhost:5000') res = test_client.get('/foobar', 'http://localhost:5000')
res.status_code.should.equal(200) res.status_code.should.equal(200)
res.data.should.contain(b"ListBucketResult") res.data.should.contain(b"ListBucketResult")
res = test_client.get('/missing-bucket/', 'http://localhost:5000') res = test_client.get('/missing-bucket', 'http://localhost:5000')
res.status_code.should.equal(404) res.status_code.should.equal(404)
res = test_client.put('/foobar/bar/', 'http://localhost:5000', data='test value') res = test_client.put('/foobar/bar', 'http://localhost:5000', data='test value')
res.status_code.should.equal(200) res.status_code.should.equal(200)
res = test_client.get('/foobar/bar/', 'http://localhost:5000') res = test_client.get('/foobar/bar', 'http://localhost:5000')
res.status_code.should.equal(200) res.status_code.should.equal(200)
res.data.should.equal(b"test value") res.data.should.equal(b"test value")
@ -46,14 +46,14 @@ def test_s3_server_post_to_bucket():
backend = server.create_backend_app("s3bucket_path") backend = server.create_backend_app("s3bucket_path")
test_client = backend.test_client() test_client = backend.test_client()
res = test_client.put('/foobar2/', 'http://localhost:5000/') res = test_client.put('/foobar2', 'http://localhost:5000/')
res.status_code.should.equal(200) res.status_code.should.equal(200)
test_client.post('/foobar2/', "https://localhost:5000/", data={ test_client.post('/foobar2', "https://localhost:5000/", data={
'key': 'the-key', 'key': 'the-key',
'file': 'nothing' 'file': 'nothing'
}) })
res = test_client.get('/foobar2/the-key/', 'http://localhost:5000/') res = test_client.get('/foobar2/the-key', 'http://localhost:5000/')
res.status_code.should.equal(200) res.status_code.should.equal(200)
res.data.should.equal(b"nothing") res.data.should.equal(b"nothing")