openstack/nova
Code Issues Proposed changes

Improve functional test base for microversion

Browse Source 
In current functional tests, when we test some
features base on microversion, we need to define
request_api_version in order to get template/sample,
but when we call the base functions, like: _do_get,
_do_post, _do_put, _do_delete, we must pass the argument
'api_version' to specify X-OpenStack-Nova-API-Version,
even if we had defined request_api_version in test class.
Do refactor, make request_api_version as default value
when 'api_version' is None so that the functional tests are
more readable.

Change-Id: I6163cb18b82ffa80ccde23f7f555e253bfec78b0
This commit is contained in:
Rui Chen
2015-06-10 15:22:42 +08:00
parent 4c8d4e9c93
commit fab9a67afa
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nova/tests/functional/api_samples_test_base.py
View File

@@ -318,18 +318,24 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase):
def _do_get(self, url, strip_version=False, api_version=None):
return self._get_response(url, 'GET', strip_version=strip_version,
api_version=api_version)
api_version=(api_version or
self.request_api_version))
def _do_post(self, url, name, subs, method='POST', api_version=None):
body = self._read_template(name) % subs
sample = self._get_sample(name, self.request_api_version)
if self.generate_samples and not os.path.exists(sample):
self._write_sample(name, body)
return self._get_response(url, method, body, api_version=api_version)
return self._get_response(url, method, body,
api_version=(api_version or
self.request_api_version))
def _do_put(self, url, name, subs, api_version=None):
return self._do_post(url, name, subs, method='PUT',
api_version=api_version)
api_version=(api_version or
self.request_api_version))
def _do_delete(self, url, api_version=None):
return self._get_response(url, 'DELETE', api_version=api_version)
return self._get_response(url, 'DELETE',
api_version=(api_version or
self.request_api_version))