From 897a033443c8c66a32209a610be613173b361b06 Mon Sep 17 00:00:00 2001 From: Jonathan Leroy Date: Wed, 21 Oct 2020 20:02:12 +0200 Subject: [PATCH] Add tests for Manager.get_zones() --- octodns/manager.py | 4 ++-- tests/test_octodns_manager.py | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/octodns/manager.py b/octodns/manager.py index eab7ac4..eff3a74 100644 --- a/octodns/manager.py +++ b/octodns/manager.py @@ -469,8 +469,8 @@ class Manager(object): def get_zone(self, zone_name): if not zone_name[-1] == '.': - raise Exception('Invalid zone name {}, missing ending dot' - .format(zone_name)) + raise ManagerException('Invalid zone name {}, missing ending dot' + .format(zone_name)) for name, config in self.config['zones'].items(): if name == zone_name: diff --git a/tests/test_octodns_manager.py b/tests/test_octodns_manager.py index 1b8752e..b493540 100644 --- a/tests/test_octodns_manager.py +++ b/tests/test_octodns_manager.py @@ -286,6 +286,18 @@ class TestManager(TestCase): .validate_configs() self.assertTrue('unknown source' in text_type(ctx.exception)) + def test_get_zone(self): + Manager(get_config_filename('simple.yaml')).get_zone('unit.tests.') + + with self.assertRaises(ManagerException) as ctx: + Manager(get_config_filename('simple.yaml')).get_zone('unit.tests') + self.assertTrue('missing ending dot' in text_type(ctx.exception)) + + with self.assertRaises(ManagerException) as ctx: + Manager(get_config_filename('simple.yaml')) \ + .get_zone('unknown-zone.tests.') + self.assertTrue('Unknown zone name' in text_type(ctx.exception)) + def test_populate_lenient_fallback(self): with TemporaryDirectory() as tmpdir: environ['YAML_TMP_DIR'] = tmpdir.dirname @@ -321,8 +333,8 @@ class TestManager(TestCase): with self.assertRaises(ManagerException) as ctx: Manager(get_config_filename('unknown-source-zone.yaml')) \ .validate_configs() - self.assertTrue('Invalid alias zone' in - text_type(ctx.exception)) + self.assertTrue('Invalid alias zone' in + text_type(ctx.exception)) class TestMainThreadExecutor(TestCase):