diff options
| author | Peter Portante <peter.portante@redhat.com> | 2013-05-23 16:34:24 -0400 |
|---|---|---|
| committer | Luis Pabon <lpabon@redhat.com> | 2013-05-24 12:08:18 -0700 |
| commit | b29164198523591a69b234e869b7a1b94bd4f08e (patch) | |
| tree | 04a3787ea446cdc42d282d5483ad21841c880f70 /gluster/swift/common/constraints.py | |
| parent | 3ff44850b4b0151b55028d45c8c77a521c478b2c (diff) | |
Add DiskDir unit test skeleton and pep8 filter
The new DiskDir unit test skeleton is quite incomplete, but gets the
DiskDir module on the board for modules covered, explicitly exposing
the fact that we need to get test coverage. This is a first step.
At the same time, we also update all the modules we have applying the
fix for pep8 errors now run under tox. We can then add a Jenkins
pre-commit job to fail on pep8 errors. This brings our code to parity
with what they are doing in OpenStack Swift.
Change-Id: Ia0565606512efda6e73f67bd00269177b89db858
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/5080
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'gluster/swift/common/constraints.py')
| -rw-r--r-- | gluster/swift/common/constraints.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gluster/swift/common/constraints.py b/gluster/swift/common/constraints.py index 11f626b..d1c990d 100644 --- a/gluster/swift/common/constraints.py +++ b/gluster/swift/common/constraints.py @@ -23,11 +23,12 @@ from gluster.swift.common import Glusterfs, ring if hasattr(swift.common.constraints, 'constraints_conf_int'): MAX_OBJECT_NAME_COMPONENT_LENGTH = \ - swift.common.constraints.constraints_conf_int( - 'max_object_name_component_length', 255) + swift.common.constraints.constraints_conf_int( + 'max_object_name_component_length', 255) else: MAX_OBJECT_NAME_COMPONENT_LENGTH = 255 + def validate_obj_name_component(obj): if len(obj) > MAX_OBJECT_NAME_COMPONENT_LENGTH: return 'too long (%d)' % len(obj) @@ -38,6 +39,7 @@ def validate_obj_name_component(obj): # Save the original check object creation __check_object_creation = swift.common.constraints.check_object_creation + # Define our new one which invokes the original def gluster_check_object_creation(req, object_name): """ @@ -61,7 +63,7 @@ def gluster_check_object_creation(req, object_name): reason = validate_obj_name_component(obj) if reason: bdy = 'Invalid object name "%s", component "%s" %s' \ - % (object_name, obj, reason) + % (object_name, obj, reason) ret = HTTPBadRequest(body=bdy, request=req, content_type='text/plain') @@ -74,6 +76,7 @@ swift.common.constraints.check_object_creation = gluster_check_object_creation # Save the original check mount __check_mount = swift.common.constraints.check_mount + # Define our new one which invokes the original def gluster_check_mount(root, drive): # FIXME: Potential performance optimization here to not call the original @@ -84,6 +87,7 @@ def gluster_check_mount(root, drive): return Glusterfs.mount(root, drive) + # Replace the original check mount with ours swift.common.constraints.check_mount = gluster_check_mount |