openstack
/
nova
Code Issues Proposed changes

Merge "parametrize max_api_version in tests"

This commit is contained in:
Jenkins 2016-02-08 05:36:58 +00:00 committed by Gerrit Code Review
parent 197bd6dd12 d359196c32
commit 5c8edcc697
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/functional/api_sample_tests/api_samples/versions/v21-version-get-resp.json.tpl
View File

@ -19,7 +19,7 @@
}
],
"status": "CURRENT",
"version": "2.21",
"version": "%(max_api_version)s",
"min_version": "2.1",
"updated": "2013-07-23T11:33:21Z"
}

2
nova/tests/functional/api_sample_tests/api_samples/versions/versions-get-resp.json.tpl
View File

@ -22,7 +22,7 @@
}
],
"status": "CURRENT",
"version": "2.21",
"version": "%(max_api_version)s",
"min_version": "2.1",
"updated": "2013-07-23T11:33:21Z"
}

8
nova/tests/functional/api_sample_tests/test_versions.py
View File

@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from nova.api.openstack import api_version_request as avr
from nova.tests.functional.api_sample_tests import api_sample_base
@ -22,10 +23,12 @@ class VersionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
# as those does not send request on particular endpoint and running
# its tests alone is enough.
scenarios = []
max_api_version = avr.max_api_version().get_string()
def test_versions_get(self):
response = self._do_get('', strip_version=True)
self._verify_response('versions-get-resp', {},
self._verify_response('versions-get-resp',
{'max_api_version': self.max_api_version},
response, 200, update_links=False)
def test_versions_get_v2(self):
@ -35,5 +38,6 @@ class VersionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
def test_versions_get_v21(self):
response = self._do_get('/v2.1', strip_version=True)
self._verify_response('v21-version-get-resp', {},
self._verify_response('v21-version-get-resp',
{'max_api_version': self.max_api_version},
response, 200, update_links=False)

6
nova/tests/unit/api/openstack/compute/test_versions.py
View File

@ -19,6 +19,7 @@ import uuid as stdlib_uuid
from oslo_serialization import jsonutils
import webob
from nova.api.openstack import api_version_request as avr
from nova.api.openstack.compute import views
from nova import test
from nova.tests.unit.api.openstack import fakes
@ -31,6 +32,7 @@ NS = {
'ns': 'http://docs.openstack.org/common/api/v1.0'
}
MAX_API_VERSION = avr.max_api_version().get_string()
EXP_LINKS = {
'v2.0': {
@ -66,7 +68,7 @@ EXP_VERSIONS = {
"v2.1": {
"id": "v2.1",
"status": "CURRENT",
"version": "2.21",
"version": MAX_API_VERSION,
"min_version": "2.1",
"updated": "2013-07-23T11:33:21Z",
"links": [
@ -128,7 +130,7 @@ class VersionsTestV20(test.NoDBTestCase):
{
"id": "v2.1",
"status": "CURRENT",
"version": "2.21",
"version": MAX_API_VERSION,
"min_version": "2.1",
"updated": "2013-07-23T11:33:21Z",
"links": [