openstack/swift
Code Issues Proposed changes

Merge "Return NoSuchBucket/Key on 404."

Browse Source
This commit is contained in:
Jenkins 2012-03-08 16:38:20 +00:00 committed by Gerrit Code Review
commit 097cca1451
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swift/common/middleware/swift3.py
View File

@ -240,7 +240,7 @@ class BucketController(Controller):
if status == 401: if status == 401:
return get_err_response('AccessDenied') return get_err_response('AccessDenied')
elif status == 404: elif status == 404:
return get_err_response('InvalidBucketName') return get_err_response('NoSuchBucket')
else: else:
return get_err_response('InvalidURI') return get_err_response('InvalidURI')
@ -311,7 +311,7 @@ class BucketController(Controller):
if status == 401: if status == 401:
return get_err_response('AccessDenied') return get_err_response('AccessDenied')
elif status == 404: elif status == 404:
return get_err_response('InvalidBucketName') return get_err_response('NoSuchBucket')
elif status == 409: elif status == 409:
return get_err_response('BucketNotEmpty') return get_err_response('BucketNotEmpty')
else: else:
@ -397,7 +397,7 @@ class ObjectController(Controller):
if status == 401: if status == 401:
return get_err_response('AccessDenied') return get_err_response('AccessDenied')
elif status == 404: elif status == 404:
return get_err_response('InvalidBucketName') return get_err_response('NoSuchBucket')
else: else:
return get_err_response('InvalidURI') return get_err_response('InvalidURI')

6
test/unit/common/middleware/test_swift3.py
View File

@ -261,7 +261,7 @@ class TestSwift3(unittest.TestCase):
code = self._test_method_error(FakeAppBucket, 'GET', '/bucket', 401) code = self._test_method_error(FakeAppBucket, 'GET', '/bucket', 401)
self.assertEquals(code, 'AccessDenied') self.assertEquals(code, 'AccessDenied')
code = self._test_method_error(FakeAppBucket, 'GET', '/bucket', 404) code = self._test_method_error(FakeAppBucket, 'GET', '/bucket', 404)
self.assertEquals(code, 'InvalidBucketName') self.assertEquals(code, 'NoSuchBucket')
code = self._test_method_error(FakeAppBucket, 'GET', '/bucket', 0) code = self._test_method_error(FakeAppBucket, 'GET', '/bucket', 0)
self.assertEquals(code, 'InvalidURI') self.assertEquals(code, 'InvalidURI')
@ -394,7 +394,7 @@ class TestSwift3(unittest.TestCase):
code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 401) code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 401)
self.assertEquals(code, 'AccessDenied') self.assertEquals(code, 'AccessDenied')
code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 404) code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 404)
self.assertEquals(code, 'InvalidBucketName') self.assertEquals(code, 'NoSuchBucket')
code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 409) code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 409)
self.assertEquals(code, 'BucketNotEmpty') self.assertEquals(code, 'BucketNotEmpty')
code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 0) code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 0)
@ -470,7 +470,7 @@ class TestSwift3(unittest.TestCase):
self.assertEquals(code, 'AccessDenied') self.assertEquals(code, 'AccessDenied')
code = self._test_method_error(FakeAppObject, 'PUT', code = self._test_method_error(FakeAppObject, 'PUT',
'/bucket/object', 404) '/bucket/object', 404)
self.assertEquals(code, 'InvalidBucketName') self.assertEquals(code, 'NoSuchBucket')
code = self._test_method_error(FakeAppObject, 'PUT', code = self._test_method_error(FakeAppObject, 'PUT',
'/bucket/object', 0) '/bucket/object', 0)
self.assertEquals(code, 'InvalidURI') self.assertEquals(code, 'InvalidURI')