summaryrefslogtreecommitdiff
path: root/designate/tests
diff options
context:
space:
mode:
Diffstat (limited to 'designate/tests')
-rw-r--r--designate/tests/test_api/test_v2/test_blacklists.py4
-rw-r--r--designate/tests/test_api/test_v2/test_pools.py3
-rw-r--r--designate/tests/test_api/test_v2/test_recordsets.py4
-rw-r--r--designate/tests/test_api/test_v2/test_tlds.py4
-rw-r--r--designate/tests/test_central/test_service.py37
-rw-r--r--designate/tests/test_mdns/test_handler.py14
-rw-r--r--designate/tests/test_notification_handler/test_neutron.py3
-rw-r--r--designate/tests/test_notification_handler/test_nova.py3
-rw-r--r--designate/tests/unit/backend/test_akamai_v2.py8
-rw-r--r--designate/tests/unit/test_central/test_basic.py45
10 files changed, 57 insertions, 68 deletions
diff --git a/designate/tests/test_api/test_v2/test_blacklists.py b/designate/tests/test_api/test_v2/test_blacklists.py
index f42778a6..32619c43 100644
--- a/designate/tests/test_api/test_v2/test_blacklists.py
+++ b/designate/tests/test_api/test_v2/test_blacklists.py
@@ -148,9 +148,7 @@ class ApiV2BlacklistsTest(ApiV2TestCase):
correct_results = [1, 2]
- for get_url, correct_result in \
- zip(get_urls, correct_results):
-
+ for get_url, correct_result in zip(get_urls, correct_results):
self.policy({'find_blacklists': '@'})
response = self.client.get(get_url)
diff --git a/designate/tests/test_api/test_v2/test_pools.py b/designate/tests/test_api/test_v2/test_pools.py
index 00d8d64c..f4ff5dfb 100644
--- a/designate/tests/test_api/test_v2/test_pools.py
+++ b/designate/tests/test_api/test_v2/test_pools.py
@@ -189,8 +189,7 @@ class ApiV2PoolsTest(ApiV2TestCase):
correct_results = [1, 1, 0]
- for get_url, correct_result in \
- zip(get_urls, correct_results):
+ for get_url, correct_result in zip(get_urls, correct_results):
response = self.client.get(get_url)
diff --git a/designate/tests/test_api/test_v2/test_recordsets.py b/designate/tests/test_api/test_v2/test_recordsets.py
index a2fdd7c3..c9d750f6 100644
--- a/designate/tests/test_api/test_v2/test_recordsets.py
+++ b/designate/tests/test_api/test_v2/test_recordsets.py
@@ -379,9 +379,7 @@ class ApiV2RecordSetsTest(ApiV2TestCase):
correct_results = [1, 1, 2, 1, 1, 2, 1, 1]
- for get_url, correct_result in \
- zip(get_urls, correct_results):
-
+ for get_url, correct_result in zip(get_urls, correct_results):
response = self.client.get(get_url)
# Check the headers are what we expect
diff --git a/designate/tests/test_api/test_v2/test_tlds.py b/designate/tests/test_api/test_v2/test_tlds.py
index ff082335..3339affe 100644
--- a/designate/tests/test_api/test_v2/test_tlds.py
+++ b/designate/tests/test_api/test_v2/test_tlds.py
@@ -179,9 +179,7 @@ class ApiV2TldsTest(ApiV2TestCase):
correct_results = [1, 2]
- for get_url, correct_result in \
- zip(get_urls, correct_results):
-
+ for get_url, correct_result in zip(get_urls, correct_results):
self.policy({'find_tlds': '@'})
response = self.client.get(get_url)
diff --git a/designate/tests/test_central/test_service.py b/designate/tests/test_central/test_service.py
index 08527d7e..5e6c3dff 100644
--- a/designate/tests/test_central/test_service.py
+++ b/designate/tests/test_central/test_service.py
@@ -1141,9 +1141,8 @@ class CentralServiceTest(CentralTestCase):
def _delete_zone(self, zone, mock_deletion_time):
# Set a zone as deleted
zid = zone.id.replace('-', '')
- query = tables.zones.update().\
- where(tables.zones.c.id == zid).\
- values(
+ query = tables.zones.update().where(
+ tables.zones.c.id == zid).values(
action='NONE',
deleted=zid,
deleted_at=mock_deletion_time,
@@ -2881,14 +2880,14 @@ class CentralServiceTest(CentralTestCase):
# Compare the actual values of attributes and ns_records
expected_attributes = values['attributes'][0]
- actual_attributes = \
- pools[1]['attributes'][0].to_primitive()['designate_object.data']
+ actual_attributes = pools[1][
+ 'attributes'][0].to_primitive()['designate_object.data']
for k in expected_attributes:
self.assertEqual(expected_attributes[k], actual_attributes[k])
expected_ns_records = values['ns_records'][0]
- actual_ns_records = \
- pools[1]['ns_records'][0].to_primitive()['designate_object.data']
+ actual_ns_records = pools[1][
+ 'ns_records'][0].to_primitive()['designate_object.data']
for k in expected_ns_records:
self.assertEqual(expected_ns_records[k], actual_ns_records[k])
@@ -3370,15 +3369,15 @@ class CentralServiceTest(CentralTestCase):
zone, context=tenant_1_context)
zone_transfer_accept = objects.ZoneTransferAccept()
- zone_transfer_accept.zone_transfer_request_id =\
- zone_transfer_request.id
+ zone_transfer_accept.zone_transfer_request_id = (
+ zone_transfer_request.id)
zone_transfer_accept.key = zone_transfer_request.key
zone_transfer_accept.zone_id = zone.id
- zone_transfer_accept = \
+ zone_transfer_accept = (
self.central_service.create_zone_transfer_accept(
- tenant_2_context, zone_transfer_accept)
+ tenant_2_context, zone_transfer_accept))
result = {}
result['zone'] = self.central_service.get_zone(
@@ -3422,15 +3421,15 @@ class CentralServiceTest(CentralTestCase):
target_tenant_id='2')
zone_transfer_accept = objects.ZoneTransferAccept()
- zone_transfer_accept.zone_transfer_request_id =\
- zone_transfer_request.id
+ zone_transfer_accept.zone_transfer_request_id = (
+ zone_transfer_request.id)
zone_transfer_accept.key = zone_transfer_request.key
zone_transfer_accept.zone_id = zone.id
- zone_transfer_accept = \
+ zone_transfer_accept = (
self.central_service.create_zone_transfer_accept(
- tenant_2_context, zone_transfer_accept)
+ tenant_2_context, zone_transfer_accept))
result = {}
result['zone'] = self.central_service.get_zone(
@@ -3473,8 +3472,8 @@ class CentralServiceTest(CentralTestCase):
target_tenant_id="2")
zone_transfer_accept = objects.ZoneTransferAccept()
- zone_transfer_accept.zone_transfer_request_id =\
- zone_transfer_request.id
+ zone_transfer_accept.zone_transfer_request_id = (
+ zone_transfer_request.id)
zone_transfer_accept.key = 'WRONG KEY'
zone_transfer_accept.zone_id = zone.id
@@ -3500,8 +3499,8 @@ class CentralServiceTest(CentralTestCase):
target_tenant_id="2")
zone_transfer_accept = objects.ZoneTransferAccept()
- zone_transfer_accept.zone_transfer_request_id =\
- zone_transfer_request.id
+ zone_transfer_accept.zone_transfer_request_id = (
+ zone_transfer_request.id)
zone_transfer_accept.key = zone_transfer_request.key
zone_transfer_accept.zone_id = zone.id
diff --git a/designate/tests/test_mdns/test_handler.py b/designate/tests/test_mdns/test_handler.py
index f354f902..d8eeaac1 100644
--- a/designate/tests/test_mdns/test_handler.py
+++ b/designate/tests/test_mdns/test_handler.py
@@ -528,13 +528,13 @@ class MdnsRequestHandlerTest(MdnsTestCase):
# example.com. 3600 IN NS ns1.example.org.
# ;AUTHORITY
# ;ADDITIONAL
- expected_response = \
- (b"49c384000001000400000000076578616d706c6503636f6d0000fc0001c0"
- b"0c0006000100000e10002f036e7331076578616d706c65036f7267000765786"
- b"16d706c65c00c551c063900000e10000002580001518000000e10c00c000200"
- b"0100000e100002c029046d61696cc00c0001000100000e100004c0000201c00"
- b"c0006000100000e100018c029c03a551c063900000e10000002580001518000"
- b"000e10")
+ expected_response = (
+ b"49c384000001000400000000076578616d706c6503636f6d0000fc0001c0"
+ b"0c0006000100000e10002f036e7331076578616d706c65036f7267000765786"
+ b"16d706c65c00c551c063900000e10000002580001518000000e10c00c000200"
+ b"0100000e100002c029046d61696cc00c0001000100000e100004c0000201c00"
+ b"c0006000100000e100018c029c03a551c063900000e10000002580001518000"
+ b"000e10")
zone = objects.Zone.from_dict({
'name': 'example.com.',
diff --git a/designate/tests/test_notification_handler/test_neutron.py b/designate/tests/test_notification_handler/test_neutron.py
index 8d15063d..e16851f2 100644
--- a/designate/tests/test_notification_handler/test_neutron.py
+++ b/designate/tests/test_notification_handler/test_neutron.py
@@ -16,8 +16,7 @@
from oslo_log import log as logging
from designate.notification_handler.neutron import NeutronFloatingHandler
-from designate.tests.test_notification_handler import \
- NotificationHandlerMixin
+from designate.tests.test_notification_handler import NotificationHandlerMixin
from designate.tests import TestCase
LOG = logging.getLogger(__name__)
diff --git a/designate/tests/test_notification_handler/test_nova.py b/designate/tests/test_notification_handler/test_nova.py
index 367bde03..5254cb77 100644
--- a/designate/tests/test_notification_handler/test_nova.py
+++ b/designate/tests/test_notification_handler/test_nova.py
@@ -19,8 +19,7 @@ from unittest import mock
from oslo_log import log as logging
from designate.notification_handler.nova import NovaFixedHandler
-from designate.tests.test_notification_handler import \
- NotificationHandlerMixin
+from designate.tests.test_notification_handler import NotificationHandlerMixin
from designate.tests import TestCase
LOG = logging.getLogger(__name__)
diff --git a/designate/tests/unit/backend/test_akamai_v2.py b/designate/tests/unit/backend/test_akamai_v2.py
index 4725ff70..918bddf5 100644
--- a/designate/tests/unit/backend/test_akamai_v2.py
+++ b/designate/tests/unit/backend/test_akamai_v2.py
@@ -346,8 +346,8 @@ class AkamaiBackendTestCase(oslotest.base.BaseTestCase):
self.gen_response(200, 'Success', {'isComplete': True})
]
- with fixtures.random_seed(0), \
- mock.patch.object(akamai.time, 'sleep') as mock_sleep:
+ with fixtures.random_seed(0), mock.patch.object(akamai.time,
+ 'sleep') as mock_sleep:
mock_sleep.return_value = None
backend.delete_zone(self.admin_context, self.zone)
@@ -396,8 +396,8 @@ class AkamaiBackendTestCase(oslotest.base.BaseTestCase):
self.gen_response(200, 'Success', {'isComplete': False})
]
- with fixtures.random_seed(0), \
- mock.patch.object(akamai.time, 'sleep') as mock_sleep:
+ with fixtures.random_seed(0), mock.patch.object(akamai.time,
+ 'sleep') as mock_sleep:
mock_sleep.return_value = None
self.assertRaisesRegex(
exceptions.Backend,
diff --git a/designate/tests/unit/test_central/test_basic.py b/designate/tests/unit/test_central/test_basic.py
index 0d153b39..8a8068e5 100644
--- a/designate/tests/unit/test_central/test_basic.py
+++ b/designate/tests/unit/test_central/test_basic.py
@@ -277,7 +277,7 @@ class CentralBasic(TestCase):
class CentralServiceTestCase(CentralBasic):
def test_conf_fixture(self):
- assert 'service:central' in designate.central.service.cfg.CONF
+ assert 'service:central' in cfg.CONF
def test_init(self):
self.assertTrue(self.service.check_for_tlds)
@@ -616,8 +616,7 @@ class CentralZoneTestCase(CentralBasic):
def test_is_valid_recordset_name_too_long(self):
zone = RoObject(name='example.org.')
- designate.central.service.cfg.CONF['service:central'].\
- max_recordset_name_len = 255
+ cfg.CONF['service:central'].max_recordset_name_len = 255
rs_name = 'a' * 255 + '.org.'
with testtools.ExpectedException(exceptions.InvalidRecordSetName) as e:
self.service._is_valid_recordset_name(self.context, zone, rs_name)
@@ -758,8 +757,8 @@ class CentralZoneTestCase(CentralBasic):
RoObject(type='PRIMARY', name='example.org.'),
[RoObject(), RoObject(), RoObject()]
)
- ctx, zone, rset = \
- self.service._create_recordset_in_storage.call_args[0]
+ ctx, zone, rset = (
+ self.service._create_recordset_in_storage.call_args[0])
self.assertEqual('example.org.', rset.name)
self.assertEqual('NS', rset.type)
@@ -805,8 +804,8 @@ class CentralZoneTestCase(CentralBasic):
RoObject(name='foo', id=CentralZoneTestCase.zone__id),
RoObject(name='bar')
)
- ctx, zone, rset = \
- self.service._update_recordset_in_storage.call_args[0]
+ ctx, zone, rset = (
+ self.service._update_recordset_in_storage.call_args[0])
self.assertEqual(len(rset.records), 1)
self.assertTrue(rset.records[0].managed)
self.assertEqual('bar', rset.records[0].data.name)
@@ -922,8 +921,8 @@ class CentralZoneTestCase(CentralBasic):
self.service.storage.find_zones = mock.Mock()
self.service.find_zones(self.context)
self.assertTrue(self.service.storage.find_zones.called)
- pcheck, ctx, target = \
- designate.central.service.policy.check.call_args[0]
+ pcheck, ctx, target = (
+ designate.central.service.policy.check.call_args[0])
self.assertEqual('find_zones', pcheck)
def test_delete_zone_has_subzone(self):
@@ -941,8 +940,8 @@ class CentralZoneTestCase(CentralBasic):
self.context,
CentralZoneTestCase.zone__id)
- pcheck, ctx, target = \
- designate.central.service.policy.check.call_args[0]
+ pcheck, ctx, target = (
+ designate.central.service.policy.check.call_args[0])
self.assertEqual('delete_zone', pcheck)
def test_delete_zone_abandon(self):
@@ -987,13 +986,13 @@ class CentralZoneTestCase(CentralBasic):
self.assertFalse(self.service.storage.delete_zone.called)
self.assertTrue(self.service.worker_api.delete_zone.called)
self.assertTrue(designate.central.service.policy.check.called)
- ctx, deleted_dom = \
- self.service.worker_api.delete_zone.call_args[0]
+ ctx, deleted_dom = (
+ self.service.worker_api.delete_zone.call_args[0])
self.assertEqual('foo', deleted_dom.name)
self.assertEqual('foo', out.name)
- pcheck, ctx, target = \
- designate.central.service.policy.check.call_args[0]
+ pcheck, ctx, target = (
+ designate.central.service.policy.check.call_args[0])
self.assertEqual('delete_zone', pcheck)
@@ -1016,13 +1015,13 @@ class CentralZoneTestCase(CentralBasic):
self.assertFalse(self.service.storage.delete_zone.called)
self.assertTrue(self.service.worker_api.delete_zone.called)
self.assertTrue(designate.central.service.policy.check.called)
- ctx, deleted_dom = \
- self.service.worker_api.delete_zone.call_args[0]
+ ctx, deleted_dom = (
+ self.service.worker_api.delete_zone.call_args[0])
self.assertEqual('foo', deleted_dom.name)
self.assertEqual('foo', out.name)
- pcheck, ctx, target = \
- designate.central.service.policy.check.call_args[0]
+ pcheck, ctx, target = (
+ designate.central.service.policy.check.call_args[0])
self.assertEqual('delete_zone', pcheck)
@@ -1725,8 +1724,8 @@ class CentralZoneExportTests(CentralBasic):
self.service.find_zone_exports(self.context)
self.assertTrue(self.service.storage.find_zone_exports.called)
- pcheck, ctx, target = \
- designate.central.service.policy.check.call_args[0]
+ pcheck, ctx, target = (
+ designate.central.service.policy.check.call_args[0])
self.assertEqual('find_zone_exports', pcheck)
def test_delete_zone_export(self):
@@ -1756,8 +1755,8 @@ class CentralZoneExportTests(CentralBasic):
self.assertEqual('t', out.tenant_id)
self.assertTrue(designate.central.service.policy.check.called)
- pcheck, ctx, target = \
- designate.central.service.policy.check.call_args[0]
+ pcheck, ctx, target = (
+ designate.central.service.policy.check.call_args[0])
self.assertEqual('delete_zone_export', pcheck)
self.assertEqual(pcheck, 'delete_zone_export')
View Lorry Controller Status