diff options
| author | Stefan Nica <snica@suse.com> | 2017-06-20 14:45:14 +0200 |
|---|---|---|
| committer | Stefan Nica <snica@suse.com> | 2017-07-18 10:48:39 +0000 |
| commit | 7d1ee4e447b14912800874a6b9ca3842d42be2e2 (patch) | |
| tree | 1ef4d5ef083f02007cc67f20da84ec5f4b210492 | |
| parent | 5034bc10afb736eedca0cb4e0503652711008e23 (diff) | |
| download | heat-7d1ee4e447b14912800874a6b9ca3842d42be2e2.tar.gz | |
Update functional tests missing skip check
There are some test cases that still use the
test.HeatIntegrationTest base class instead of
the functional_base.FunctionalTestsBase base class.
The effect is that these tests will not check whether
they are skipped (e.g. by setting the
heat_plugin/skip_functional_tests oslo.config attr)
and in some cases end up being executed and reporting
false errors.
Change-Id: I074901f4d0c0c84fa09554e09095402fb9cf0b8e
Closes-Bug: #1699124
(cherry picked from commit c4e8897fda571bbfaa40516b15cf0d7aef4cb1e9)
| -rw-r--r-- | heat_integrationtests/functional/test_preview.py | 4 | ||||
| -rw-r--r-- | heat_integrationtests/functional/test_template_resource.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/heat_integrationtests/functional/test_preview.py b/heat_integrationtests/functional/test_preview.py index 99c24ebd3..afef84ab5 100644 --- a/heat_integrationtests/functional/test_preview.py +++ b/heat_integrationtests/functional/test_preview.py @@ -10,12 +10,12 @@ # License for the specific language governing permissions and limitations # under the License. -from heat_integrationtests.common import test +from heat_integrationtests.functional import functional_base from heatclient import exc import six -class StackPreviewTest(test.HeatIntegrationTest): +class StackPreviewTest(functional_base.FunctionalTestsBase): template = ''' heat_template_version: 2015-04-30 parameters: diff --git a/heat_integrationtests/functional/test_template_resource.py b/heat_integrationtests/functional/test_template_resource.py index ef2f4f5c6..c05912c4c 100644 --- a/heat_integrationtests/functional/test_template_resource.py +++ b/heat_integrationtests/functional/test_template_resource.py @@ -740,7 +740,7 @@ resources: self.stack_resume(stack_identifier=stack_identifier) -class ValidateFacadeTest(test.HeatIntegrationTest): +class ValidateFacadeTest(functional_base.FunctionalTestsBase): """Prove that nested stack errors don't suck.""" template = ''' |