Merge "Fix the removal of skip_unless_config decorator in Tempest"

This commit is contained in:
Jenkins 2017-03-10 12:46:10 +00:00 committed by Gerrit Code Review
commit 91987792a8
2 changed files with 8 additions and 2 deletions

View File

@ -16,6 +16,7 @@ from tempest import test
from tempest import config
from tempest.lib import decorators
from tempest.lib import exceptions as lib_exc
import testtools
from designate_tempest_plugin.tests import base
from designate_tempest_plugin.common import waiters
@ -89,7 +90,9 @@ class ZonesTest(base.BaseDnsV2Test):
@test.attr(type='slow')
@decorators.skip_because(bug='1623576')
@decorators.idempotent_id('ad8d1f5b-da66-46a0-bbee-14dc84a5d791')
@config.skip_unless_config('dns', 'nameservers')
@testtools.skipUnless(
config.CONF.dns.nameservers,
"Config option dns.nameservers is missing or empty")
def test_zone_create_propagates_to_nameservers(self):
LOG.info('Create a zone')
_, zone = self.client.create_zone()
@ -101,7 +104,9 @@ class ZonesTest(base.BaseDnsV2Test):
@test.attr(type='slow')
@decorators.skip_because(bug='1623576')
@decorators.idempotent_id('d13d3095-c78f-4aae-8fe3-a74ccc335c84')
@config.skip_unless_config('dns', 'nameservers')
@testtools.skipUnless(
config.CONF.dns.nameservers,
"Config option dns.nameservers is missing or empty")
def test_zone_delete_propagates_to_nameservers(self):
LOG.info('Create a zone')
_, zone = self.client.create_zone()

View File

@ -5,4 +5,5 @@
dnspython>=1.14.0;python_version=='2.7' # http://www.dnspython.org/LICENSE
dnspython3!=1.13.0,!=1.14.0,>=1.12.0;python_version>='3.0' # http://www.dnspython.org/LICENSE
ddt>=1.0.1 # MIT
testtools>=1.4.0 # MIT
tempest>=14.0.0 # Apache-2.0