openstack/ironic
Code Issues Proposed changes

Merge "Skip VIF tests for standalone ironic"

Browse Source
This commit is contained in:
Jenkins 2017-03-30 11:32:15 +00:00 committed by Gerrit Code Review
commit 70fd2e36b7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ironic_tempest_plugin/tests/api/admin/test_nodes.py
View File

@ -11,6 +11,8 @@
# under the License. # under the License.
import six import six
from tempest import config
from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest.lib import decorators from tempest.lib import decorators
from tempest.lib import exceptions as lib_exc from tempest.lib import exceptions as lib_exc
@ -19,6 +21,8 @@ from ironic_tempest_plugin.common import waiters
from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
from ironic_tempest_plugin.tests.api.admin import base from ironic_tempest_plugin.tests.api.admin import base
CONF = config.CONF
class TestNodes(base.BaseBaremetalTest): class TestNodes(base.BaseBaremetalTest):
"""Tests for baremetal nodes.""" """Tests for baremetal nodes."""
@ -166,6 +170,12 @@ class TestNodesVif(base.BaseBaremetalTest):
min_microversion = '1.28' min_microversion = '1.28'
@classmethod
def skip_checks(cls):
super(TestNodesVif, cls).skip_checks()
if not CONF.service_available.neutron:
raise cls.skipException('Neutron is not enabled.')
def setUp(self): def setUp(self):
super(TestNodesVif, self).setUp() super(TestNodesVif, self).setUp()