From 4b9e2270341df3478878c130c2c269b30a11ad2f Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Wed, 7 Mar 2018 21:21:48 -0500 Subject: [PATCH] API tests: Don't depend on template versions >mitaka The trademark program interop tests run against clouds as old as the Mitaka release, so don't depend on the presence of template plugin versions that are newer than that. Change-Id: If901077adee61df2273786283dcbdaef02dbe30a --- heat_tempest_plugin/tests/api/gabbits/resourcetypes.yaml | 2 +- heat_tempest_plugin/tests/api/gabbits/templates.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/heat_tempest_plugin/tests/api/gabbits/resourcetypes.yaml b/heat_tempest_plugin/tests/api/gabbits/resourcetypes.yaml index a259214..809feab 100644 --- a/heat_tempest_plugin/tests/api/gabbits/resourcetypes.yaml +++ b/heat_tempest_plugin/tests/api/gabbits/resourcetypes.yaml @@ -24,4 +24,4 @@ tests: status: 200 response_json_paths: $.resources.TestResource.type: OS::Heat::TestResource - $.heat_template_version: '2016-10-14' + $.heat_template_version: /^20[1-9][0-9]-[0-1][0-9]-[0-3][0-9]$/ diff --git a/heat_tempest_plugin/tests/api/gabbits/templates.yaml b/heat_tempest_plugin/tests/api/gabbits/templates.yaml index 0533f4a..ab0bbab 100644 --- a/heat_tempest_plugin/tests/api/gabbits/templates.yaml +++ b/heat_tempest_plugin/tests/api/gabbits/templates.yaml @@ -8,11 +8,11 @@ tests: GET: /template_versions status: 200 response_json_paths: - $.template_versions[?(@.version='heat_template_version.2017-02-24')].type: hot + $.template_versions[?(@.version='heat_template_version.2016-04-08')].type: hot - name: list template functions desc: 721ff23c-8527-480f-a090-1c915b4f8430 - GET: /template_versions/heat_template_version.2016-10-14/functions + GET: /template_versions/heat_template_version.2016-04-08/functions status: 200 response_json_paths: $.template_functions[?(@.functions='get_file')].description: