mirror/github-octodns
1
0
Fork 0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00
Code Issues Releases Activity

Merge pull request #645 from octodns/clear-out-nbsp

Browse Source 
Replace some nbsp chars that have slipped into manager.py somehow
This commit is contained in:
Ross McFarland
2020-12-10 10:26:33 -08:00
committed by GitHub
parent 4516fa4fbf a7bb6a306c
commit bf99785aee
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
octodns/manager.py
+4 -4
View File
@@ -288,7 +288,7 @@ class Manager(object):
self.log.error('Invalid alias zone {}, target {} does '
'not exist'.format(zone_name, source_zone))
raise ManagerException('Invalid alias zone {}: '
'source zone {} does not exist'
'source zone {} does not exist'
.format(zone_name, source_zone))
# Check that the source zone is not an alias zone itself.
@@ -296,7 +296,7 @@ class Manager(object):
self.log.error('Invalid alias zone {}, target {} is an '
'alias zone'.format(zone_name, source_zone))
raise ManagerException('Invalid alias zone {}: source '
'zone {} is an alias zone'
'zone {} is an alias zone'
.format(zone_name, source_zone))
aliased_zones[zone_name] = source_zone
@@ -482,13 +482,13 @@ class Manager(object):
if source_zone not in self.config['zones']:
self.log.exception('Invalid alias zone')
raise ManagerException('Invalid alias zone {}: '
'source zone {} does not exist'
'source zone {} does not exist'
.format(zone_name, source_zone))
if 'alias' in self.config['zones'][source_zone]:
self.log.exception('Invalid alias zone')
raise ManagerException('Invalid alias zone {}: '
'source zone {} is an alias zone'
'source zone {} is an alias zone'
.format(zone_name, source_zone))
# this is just here to satisfy coverage, see
tests/test_octodns_manager.py
+2 -2
View File
@@ -180,7 +180,7 @@ class TestManager(TestCase):
tc = Manager(get_config_filename('unknown-source-zone.yaml')) \
.sync()
self.assertEquals('Invalid alias zone alias.tests.: source zone '
'does-not-exists.tests. does not exist',
'does-not-exists.tests. does not exist',
text_type(ctx.exception))
# Alias zone that points to another alias zone.
@@ -188,7 +188,7 @@ class TestManager(TestCase):
tc = Manager(get_config_filename('alias-zone-loop.yaml')) \
.sync()
self.assertEquals('Invalid alias zone alias-loop.tests.: source '
'zone alias.tests. is an alias zone',
'zone alias.tests. is an alias zone',
text_type(ctx.exception))
def test_compare(self):