Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Useless return statement in validate_sort_dir"

Browse Source
This commit is contained in:
Jenkins
2016-02-24 16:49:01 +00:00
committed by Gerrit Code Review
parent 9af96114af 1c963fdc96
commit db649d86b6
7 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/api/controllers/v1/action.py
View File

@@ -254,7 +254,7 @@ class ActionsController(rest.RestController):
resource_url=None, resource_url=None,
action_plan_uuid=None, audit_uuid=None): action_plan_uuid=None, audit_uuid=None):
limit = api_utils.validate_limit(limit) limit = api_utils.validate_limit(limit)
sort_dir = api_utils.validate_sort_dir(sort_dir) api_utils.validate_sort_dir(sort_dir)
marker_obj = None marker_obj = None
if marker: if marker:

2
watcher/api/controllers/v1/action_plan.py
View File

@@ -283,7 +283,7 @@ class ActionPlansController(rest.RestController):
resource_url=None, audit_uuid=None): resource_url=None, audit_uuid=None):
limit = api_utils.validate_limit(limit) limit = api_utils.validate_limit(limit)
sort_dir = api_utils.validate_sort_dir(sort_dir) api_utils.validate_sort_dir(sort_dir)
marker_obj = None marker_obj = None
if marker: if marker:

2
watcher/api/controllers/v1/audit.py
View File

@@ -263,7 +263,7 @@ class AuditsController(rest.RestController):
sort_key, sort_dir, expand=False, sort_key, sort_dir, expand=False,
resource_url=None, audit_template=None): resource_url=None, audit_template=None):
limit = api_utils.validate_limit(limit) limit = api_utils.validate_limit(limit)
sort_dir = api_utils.validate_sort_dir(sort_dir) api_utils.validate_sort_dir(sort_dir)
marker_obj = None marker_obj = None
if marker: if marker:

2
watcher/api/controllers/v1/audit_template.py
View File

@@ -203,7 +203,7 @@ class AuditTemplatesController(rest.RestController):
api_utils.validate_search_filters( api_utils.validate_search_filters(
filters, objects.audit_template.AuditTemplate.fields.keys()) filters, objects.audit_template.AuditTemplate.fields.keys())
limit = api_utils.validate_limit(limit) limit = api_utils.validate_limit(limit)
sort_dir = api_utils.validate_sort_dir(sort_dir) api_utils.validate_sort_dir(sort_dir)
marker_obj = None marker_obj = None
if marker: if marker:

2
watcher/api/controllers/v1/goal.py
View File

@@ -159,7 +159,7 @@ class GoalsController(rest.RestController):
resource_url=None, goal_name=None): resource_url=None, goal_name=None):
limit = api_utils.validate_limit(limit) limit = api_utils.validate_limit(limit)
sort_dir = api_utils.validate_sort_dir(sort_dir) api_utils.validate_sort_dir(sort_dir)
goals = [] goals = []

1
watcher/api/controllers/v1/utils.py
View File

@@ -47,7 +47,6 @@ def validate_sort_dir(sort_dir):
raise wsme.exc.ClientSideError(_("Invalid sort direction: %s. " raise wsme.exc.ClientSideError(_("Invalid sort direction: %s. "
"Acceptable values are " "Acceptable values are "
"'asc' or 'desc'") % sort_dir) "'asc' or 'desc'") % sort_dir)
return sort_dir
def validate_search_filters(filters, allowed_fields): def validate_search_filters(filters, allowed_fields):

7
watcher/tests/api/v1/test_utils.py
View File

@@ -40,8 +40,11 @@ class TestApiUtils(base.TestCase):
self.assertRaises(wsme.exc.ClientSideError, utils.validate_limit, 0) self.assertRaises(wsme.exc.ClientSideError, utils.validate_limit, 0)
def test_validate_sort_dir(self): def test_validate_sort_dir(self):
sort_dir = utils.validate_sort_dir('asc') # if sort_dir is valid, nothing should happen
self.assertEqual('asc', sort_dir) try:
utils.validate_sort_dir('asc')
except Exception as exc:
self.fail(exc)
# invalid sort_dir parameter # invalid sort_dir parameter
self.assertRaises(wsme.exc.ClientSideError, self.assertRaises(wsme.exc.ClientSideError,