openstack/designate
Code Issues Proposed changes

Removing unused code and updated unit tests readme

Browse Source 
* Removed unused ipa test.
* Removed redundant resource test.
* Updated README.

Change-Id: I4738793e1f342f992e71f829e886398e1f7b9e67
This commit is contained in:
Erik Olof Gunnar Andersson
2019-05-25 13:36:04 -07:00
parent 4e49b5581f
commit 201d8be145
5 changed files with 2 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
designate/tests/test_central/_test_service_ipa.py
-195
View File
@@ -1,195 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright 2014 Red Hat, Inc.
#
# Author: Rich Megginson <rmeggins@redhat.com>
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import unittest
from oslo_log import log as logging
import testtools
import designate.tests.test_central.test_service
from designate import utils
from designate import exceptions
from designate.backend import impl_ipa
LOG = logging.getLogger(__name__)
class CentralServiceTestIPA(designate.tests.test_central.
test_service.CentralServiceTest):
test_config_file_name = "designate-ipa-test.conf"
def start_service(self, svc_name, *args, **kw):
"""
override here so we can make sure central is set up correctly
for live ipa testing
"""
if svc_name == 'central':
self.config(backend_driver='ipa', group='service:central')
# options in the test_config file can override the
# defaults set elsewhere
test_config = utils.find_config(self.test_config_file_name)
self.CONF([], project='designate',
default_config_files=test_config)
return super(CentralServiceTestIPA, self).start_service(svc_name,
*args, **kw)
def setUp(self):
super(CentralServiceTestIPA, self).setUp()
# go directly through storage api to bypass tenant/policy checks
save_all_tenants = self.admin_context.all_tenants
self.admin_context.all_tenants = True
self.startzones = self.central_service.storage.\
find_zones(self.admin_context)
LOG.debug("%s.setUp: startzones %d" % (self.__class__,
len(self.startzones)))
self.admin_context.all_tenants = save_all_tenants
def tearDown(self):
# delete zones
# go directly through storage api to bypass tenant/policy checks
self.admin_context.all_tenants = True
zones = self.central_service.storage.\
find_zones(self.admin_context)
LOG.debug("%s.tearDown: zones %d" % (self.__class__,
len(self.startzones)))
for zone in zones:
if zone in self.startzones:
continue
# go directly to backend - front end zones will be
# removed when the database fixture is reset
self.central_service.backend.delete_zone(self.admin_context,
zone)
super(CentralServiceTestIPA, self).tearDown()
def assertRecordsEqual(self, rec1, rec2):
rec1dict = dict(rec1.items())
rec2dict = dict(rec2.items())
self.assertEqual(rec1dict, rec2dict)
def test_delete_recordset_extra(self):
zone = self.create_zone()
# Create a recordset
recsetA = self.create_recordset(zone, 'A')
recsetMX = self.create_recordset(zone, 'MX')
# create two records in recsetA
recA0 = self.create_record(zone, recsetA, fixture=0)
recA1 = self.create_record(zone, recsetA, fixture=1)
# create two records in recsetMX
recMX0 = self.create_record(zone, recsetMX, fixture=0)
recMX1 = self.create_record(zone, recsetMX, fixture=1)
# verify two records in each recset
criterion = {
'zone_id': zone['id'],
'recordset_id': recsetA['id']
}
records = self.central_service.find_records(
self.admin_context, criterion)
self.assertEqual(2, len(records))
self.assertRecordsEqual(recA0, records[0])
self.assertRecordsEqual(recA1, records[1])
criterion['recordset_id'] = recsetMX['id']
records = self.central_service.find_records(
self.admin_context, criterion)
self.assertEqual(2, len(records))
self.assertRecordsEqual(recMX0, records[0])
self.assertRecordsEqual(recMX1, records[1])
# Delete recsetA
self.central_service.delete_recordset(
self.admin_context, zone['id'], recsetA['id'])
# Fetch the recordset again, ensuring an exception is raised
with testtools.ExpectedException(exceptions.RecordSetNotFound):
self.central_service.get_recordset(
self.admin_context, zone['id'], recsetA['id'])
# should be no records left in recsetA
# however, that doesn't appear to be how
# designate currently works, at least in
# this particular test
delete_recset_deletes_recs = False
if delete_recset_deletes_recs:
criterion['recordset_id'] = recsetA['id']
records = self.central_service.find_records(
self.admin_context, criterion)
self.assertEqual(0, len(records))
# verify two records in recsetMX
criterion['recordset_id'] = recsetMX['id']
records = self.central_service.find_records(
self.admin_context, criterion)
self.assertEqual(2, len(records))
# Delete recsetMX
self.central_service.delete_recordset(
self.admin_context, zone['id'], recsetMX['id'])
def test_create_zone_no_min_ttl(self):
"""Override - ipa does not allow negative ttl values -
instead, check for proper error
"""
self.policy({'use_low_ttl': '!'})
self.config(min_ttl="None",
group='service:central')
values = self.get_zone_fixture(1)
values['ttl'] = -100
# Create a server
self.create_nameserver()
# Create zone with negative TTL
with testtools.ExpectedException(impl_ipa.IPAInvalidData):
self.central_service.create_zone(
self.admin_context, values=values)
@unittest.skip("this is currently broken in IPA")
def test_idn_create_zone_over_tld(self):
pass
@unittest.skip("not supported in IPA")
def test_create_tsigkey(self):
pass
@unittest.skip("not supported in IPA")
def test_get_tsigkey(self):
pass
@unittest.skip("not supported in IPA")
def test_find_tsigkeys(self):
pass
@unittest.skip("not supported in IPA")
def test_delete_tsigkey(self):
pass
@unittest.skip("not supported in IPA")
def test_update_tsigkey(self):
pass
designate/tests/test_resources/__init__.py
View File
designate/tests/test_resources/test_templates/__init__.py
View File
designate/tests/test_resources/test_templates/test_bind9.py
-29
View File
@@ -1,29 +0,0 @@
# Copyright 2014 Cloudwatt
#
# Author: Jordan Pittier <jordan.pittier@cloudwatt.com>
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from designate.tests import TestCase
from designate import utils
LOG = logging.getLogger(__name__)
class Bind9Test(TestCase):
def test_bind9_zone_ends_with_empty_line(self):
name = ['templates', 'bind9-zone.jinja2']
resource_string = utils.resource_string(*name)
self.assertEqual(b'\n\n', resource_string[-2:])
designate/tests/unit/README
+2 -6
View File
@@ -2,9 +2,5 @@ This directory contains pure unit tests.
Examples:
ostestr --regex designate.tests.test_unit
python setup.py testr --coverage -t designate.tests.test_unit
tox -e py27 -- tests.unit
tox -e py37 -- tests.unit.backend