openstack
/
tempest
Code Issues Proposed changes

Merge "cls.os is deprecated use cls.os_primary"

This commit is contained in:
Jenkins 2017-05-25 02:30:52 +00:00 committed by Gerrit Code Review
parent d2c0394cc0 cf999a83f0
commit 543ed08825
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tempest/test.py
View File

@ -373,9 +373,9 @@ class BaseTestCase(testtools.testcase.WithAttributes,
@classmethod
def resource_setup(cls):
"""Class level resource setup for test cases."""
if hasattr(cls, "os"):
if hasattr(cls, "os_primary"):
cls.validation_resources = vresources.create_validation_resources(
cls.os, cls.validation_resources)
cls.os_primary, cls.validation_resources)
else:
LOG.warning("Client manager not found, validation resources not"
" created")
@ -388,8 +388,8 @@ class BaseTestCase(testtools.testcase.WithAttributes,
resources, in case a failure during `resource_setup` should happen.
"""
if cls.validation_resources:
if hasattr(cls, "os"):
vresources.clear_validation_resources(cls.os,
if hasattr(cls, "os_primary"):
vresources.clear_validation_resources(cls.os_primary,
cls.validation_resources)
cls.validation_resources = {}
else: