openstack
/
deb-glare
Code Issues Proposed changes

Merge "Allow to set data_api and lock_api for functional tests"

This commit is contained in:
Jenkins 2017-01-10 14:25:42 +00:00 committed by Gerrit Code Review
parent a254abd3a4 2ef73069fd
commit c79bb02041
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glare/tests/functional/__init__.py
View File

@ -275,7 +275,7 @@ class GlareServer(Server):
self.pid_file = pid_file or os.path.join(self.test_dir, "glare.pid")
self.log_file = os.path.join(self.test_dir, "glare.log")
self.delayed_delete = delayed_delete
self.workers = 0
self.workers = 1
self.policy_file = policy_file
self.policy_default_rule = 'default'
self.disable_path = None
@ -289,6 +289,8 @@ class GlareServer(Server):
self.send_identity_headers = False
self.enabled_artifact_types = ''
self.custom_artifact_types_modules = ''
self.data_api = 'glare.db.artifact_api.ArtifactAPI'
self.lock_api = 'glare.db.artifact_api.ArtifactLockApi'
self.conf_base = """[DEFAULT]
debug = %(debug)s
@ -303,6 +305,8 @@ workers = %(workers)s
lock_path = %(lock_path)s
enabled_artifact_types = %(enabled_artifact_types)s
custom_artifact_types_modules = %(custom_artifact_types_modules)s
data_api = %(data_api)s
lock_api = %(lock_api)s
[oslo_policy]
policy_file = %(policy_file)s
policy_default_rule = %(policy_default_rule)s

8
glare/tests/functional/test_sample_artifact.py
View File

@ -37,9 +37,11 @@ class TestList(base.TestArtifact):
'str1': 'bugaga',
'bool1': True})
for i in range(5)]
# Sorting by several custom columns leads to 400 error
url = '/sample_artifact?limit=1&sort=float1:asc,int1:asc,name:desc'
self.get(url=url, status=400)
if self.glare_server.data_api == 'glare.db.artifact_api.ArtifactAPI':
# Sorting by several custom columns leads to 400 error
url = '/sample_artifact?limit=1&sort=float1:asc,int1:asc,name:desc'
self.get(url=url, status=400)
# sort by 'next' url
url = '/sample_artifact?limit=1&sort=int1:asc,name:desc'