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

S3 should allow dashes in bucket names. Closes #5.

Browse Source
This commit is contained in:
Steve Pulec 2013-03-23 09:57:20 -04:00
parent b03d48e6bc
commit e55f26a07a
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/s3/urls.py
View File

@ -1,10 +1,10 @@
from .responses import bucket_response, key_response
url_bases = [
"https?://(?P<bucket_name>\w*)\.?s3.amazonaws.com"
"https?://(?P<bucket_name>[a-zA-Z0-9\-_]*)\.?s3.amazonaws.com"
]
url_paths = {
'{0}/$': bucket_response,
'{0}/(?P<key_name>\w+)': key_response,
'{0}/(?P<key_name>[a-zA-Z0-9\-_]+)': key_response,
}

2
moto/sqs/urls.py
View File

@ -6,5 +6,5 @@ url_bases = [
url_paths = {
'{0}/$': QueuesResponse().dispatch2,
'{0}/(?P<account_id>\d+)/(?P<queue_name>\w+)': QueueResponse().dispatch,
'{0}/(?P<account_id>\d+)/(?P<queue_name>[a-zA-Z0-9\-_]+)': QueueResponse().dispatch,
}

2
tests/test_core/test_url_mapping.py
View File

@ -13,7 +13,7 @@ def test_flask_path_converting_simple():
def test_flask_path_converting_regex():
convert_regex_to_flask_path("/(?P<key_name>\w+)").should.equal('/<regex("\w+"):key_name>')
convert_regex_to_flask_path("/(?P<key_name>[a-zA-Z0-9\-_]+)").should.equal('/<regex("[a-zA-Z0-9\-_]+"):key_name>')
convert_regex_to_flask_path("(?P<account_id>\d+)/(?P<queue_name>.*)$").should.equal(
'<regex("\d+"):account_id>/<regex(".*"):queue_name>'

6
tests/test_s3/test_s3.py
View File

@ -107,6 +107,12 @@ def test_missing_bucket():
conn.get_bucket.when.called_with('mybucket').should.throw(S3ResponseError)
@mock_s3
def test_bucket_with_dash():
conn = boto.connect_s3('the_key', 'the_secret')
conn.get_bucket.when.called_with('mybucket-test').should.throw(S3ResponseError)
@mock_s3
def test_bucket_deletion():
conn = boto.connect_s3('the_key', 'the_secret')