diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-18 06:44:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-18 06:44:09 +0000 |
| commit | 559bc355fba538423bd9db4605dbb02e3ff6f4a5 (patch) | |
| tree | 43bfbaef724669a34843e280d53a915a3cac8cba | |
| parent | 7738ad7349db371d269ea622e363fb004eab7c1f (diff) | |
| parent | 7d1ee4e447b14912800874a6b9ca3842d42be2e2 (diff) | |
| download | heat-559bc355fba538423bd9db4605dbb02e3ff6f4a5.tar.gz | |
Merge "Update functional tests missing skip check" into stable/ocata
| -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 = ''' |