summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-26 19:10:29 +0000
committerGerrit Code Review <review@openstack.org>2016-05-26 19:10:29 +0000
commitec6995f82e2d2eb48228c3208f9a2e41c44c7599 (patch)
treed342db02197f083c1dff6ba1b66c84a551149990
parent1177796620c7925650fc6737aa6a27f8db367952 (diff)
parent8aaa574fb3d564d498a8036caf6f693766c358e6 (diff)
Merge "Skip nameserver propagation tests when no NS's in conf"0.1.0
-rw-r--r--designate_tempest_plugin/tests/scenario/v2/test_zones.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/designate_tempest_plugin/tests/scenario/v2/test_zones.py b/designate_tempest_plugin/tests/scenario/v2/test_zones.py
index 6ee479f..6c5bf0e 100644
--- a/designate_tempest_plugin/tests/scenario/v2/test_zones.py
+++ b/designate_tempest_plugin/tests/scenario/v2/test_zones.py
@@ -13,11 +13,13 @@
13# under the License. 13# under the License.
14from oslo_log import log as logging 14from oslo_log import log as logging
15from tempest import test 15from tempest import test
16from tempest import config
16from tempest.lib import exceptions as lib_exc 17from tempest.lib import exceptions as lib_exc
17 18
18from designate_tempest_plugin.tests import base 19from designate_tempest_plugin.tests import base
19from designate_tempest_plugin.common import waiters 20from designate_tempest_plugin.common import waiters
20 21
22
21LOG = logging.getLogger(__name__) 23LOG = logging.getLogger(__name__)
22 24
23 25
@@ -84,6 +86,7 @@ class ZonesTest(base.BaseDnsV2Test):
84 86
85 @test.attr(type='slow') 87 @test.attr(type='slow')
86 @test.idempotent_id('ad8d1f5b-da66-46a0-bbee-14dc84a5d791') 88 @test.idempotent_id('ad8d1f5b-da66-46a0-bbee-14dc84a5d791')
89 @config.skip_unless_config('dns', 'nameservers')
87 def test_zone_create_propagates_to_nameservers(self): 90 def test_zone_create_propagates_to_nameservers(self):
88 LOG.info('Create a zone') 91 LOG.info('Create a zone')
89 _, zone = self.client.create_zone() 92 _, zone = self.client.create_zone()
@@ -94,6 +97,7 @@ class ZonesTest(base.BaseDnsV2Test):
94 97
95 @test.attr(type='slow') 98 @test.attr(type='slow')
96 @test.idempotent_id('d13d3095-c78f-4aae-8fe3-a74ccc335c84') 99 @test.idempotent_id('d13d3095-c78f-4aae-8fe3-a74ccc335c84')
100 @config.skip_unless_config('dns', 'nameservers')
97 def test_zone_delete_propagates_to_nameservers(self): 101 def test_zone_delete_propagates_to_nameservers(self):
98 LOG.info('Create a zone') 102 LOG.info('Create a zone')
99 _, zone = self.client.create_zone() 103 _, zone = self.client.create_zone()