From c816fe7af0af95ef3bef09d2581000b0b784f5a5 Mon Sep 17 00:00:00 2001 From: Alizey Jalil Date: Mon, 11 Dec 2023 17:43:11 +0530 Subject: [PATCH 1/6] Added test for missing zone file --- .DS_Store | Bin 0 -> 6148 bytes octodns/manager.py | 5 +++++ tests/config/missing-zone-config.yaml | 10 ++++++++++ tests/test_octodns_manager.py | 5 +++++ 4 files changed, 20 insertions(+) create mode 100644 .DS_Store create mode 100644 tests/config/missing-zone-config.yaml diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a5c2315f7bb7cc4988bd116fdc15e67a4bdf779f GIT binary patch literal 6148 zcmeHKJ8DBg3>+nf7}B^*xmWNF7UP`27ce*w7ydvzHcagx&TK46P??6LdF zKfLCx*J;X10VyB_q<|EV0>4zidoOMJn5ZZPq<|FoR=~dxjqcbBhs5}FFvJKzoG=~6 zb<7gP<_Tgi91@wKSyG8fwHh%j>CCsP>xDyN(qT1xSUuTlLa}%{?{85K>xqg|Knh$c zaG%?m_y1@5jrsqQq@5Iy0{=<@n=Dt$1z)Lp>*(dY*Eaf^?lqruH?D)i5bc;4?U);H e$4^m|b Date: Mon, 11 Dec 2023 17:43:52 +0530 Subject: [PATCH 2/6] Added test for missing zone --- tests/config/missing-zone-config.yaml | 7 ++++++- tests/test_octodns_manager.py | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/config/missing-zone-config.yaml b/tests/config/missing-zone-config.yaml index 8b509cc..ccd7bf9 100644 --- a/tests/config/missing-zone-config.yaml +++ b/tests/config/missing-zone-config.yaml @@ -7,4 +7,9 @@ providers: dump: class: octodns.provider.yaml.YamlProvider directory: env/YAML_TMP_DIR -zones: {} \ No newline at end of file +zones: + unit.tests.: + sources: + - in + targets: + - dump diff --git a/tests/test_octodns_manager.py b/tests/test_octodns_manager.py index 7db4fde..b1af213 100644 --- a/tests/test_octodns_manager.py +++ b/tests/test_octodns_manager.py @@ -81,7 +81,9 @@ class TestManager(TestCase): def test_missing_zone(self): with self.assertRaises(ManagerException) as ctx: - Manager(get_config_filename('missing-zone-config.yaml')).sync() + Manager(get_config_filename('missing-zone-config.yaml')).sync( + ['missing.zones.'] + ) self.assertTrue('Passed zone:' in str(ctx.exception)) def test_missing_targets(self): From d9ac836c243fd8eb087143fe4c7f6907b66eeeb9 Mon Sep 17 00:00:00 2001 From: Alizey Jalil Date: Tue, 12 Dec 2023 14:50:41 +0530 Subject: [PATCH 3/6] Removed ds_store file --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index a5c2315f7bb7cc4988bd116fdc15e67a4bdf779f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ8DBg3>+nf7}B^*xmWNF7UP`27ce*w7ydvzHcagx&TK46P??6LdF zKfLCx*J;X10VyB_q<|EV0>4zidoOMJn5ZZPq<|FoR=~dxjqcbBhs5}FFvJKzoG=~6 zb<7gP<_Tgi91@wKSyG8fwHh%j>CCsP>xDyN(qT1xSUuTlLa}%{?{85K>xqg|Knh$c zaG%?m_y1@5jrsqQq@5Iy0{=<@n=Dt$1z)Lp>*(dY*Eaf^?lqruH?D)i5bc;4?U);H e$4^m|b Date: Wed, 13 Dec 2023 14:42:02 +0530 Subject: [PATCH 4/6] Removed the specific config file used missing zone test use case --- tests/config/missing-zone-config.yaml | 15 --------------- tests/test_octodns_manager.py | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 tests/config/missing-zone-config.yaml diff --git a/tests/config/missing-zone-config.yaml b/tests/config/missing-zone-config.yaml deleted file mode 100644 index ccd7bf9..0000000 --- a/tests/config/missing-zone-config.yaml +++ /dev/null @@ -1,15 +0,0 @@ -manager: - max_workers: 2 -providers: - in: - class: octodns.provider.yaml.YamlProvider - directory: tests/config - dump: - class: octodns.provider.yaml.YamlProvider - directory: env/YAML_TMP_DIR -zones: - unit.tests.: - sources: - - in - targets: - - dump diff --git a/tests/test_octodns_manager.py b/tests/test_octodns_manager.py index b1af213..90a1ff1 100644 --- a/tests/test_octodns_manager.py +++ b/tests/test_octodns_manager.py @@ -81,7 +81,7 @@ class TestManager(TestCase): def test_missing_zone(self): with self.assertRaises(ManagerException) as ctx: - Manager(get_config_filename('missing-zone-config.yaml')).sync( + Manager(get_config_filename('dynamic-config.yaml')).sync( ['missing.zones.'] ) self.assertTrue('Passed zone:' in str(ctx.exception)) From 9e1aa7b8edfb723656f41f97bab57f9a653d5e1b Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 13 Dec 2023 08:22:28 -0800 Subject: [PATCH 5/6] Apply suggestions from code review --- octodns/manager.py | 2 +- tests/test_octodns_manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/octodns/manager.py b/octodns/manager.py index f52457d..791b3ec 100644 --- a/octodns/manager.py +++ b/octodns/manager.py @@ -604,7 +604,7 @@ class Manager(object): for zone_name, config in zones.items(): if config is None: raise ManagerException( - f'Passed zone: {zone_name} not found in config' + f'Requested zone "{zone_name}" not found in config' ) decoded_zone_name = idna_decode(zone_name) self.log.info('sync: zone=%s', decoded_zone_name) diff --git a/tests/test_octodns_manager.py b/tests/test_octodns_manager.py index 90a1ff1..b8f3c92 100644 --- a/tests/test_octodns_manager.py +++ b/tests/test_octodns_manager.py @@ -84,7 +84,7 @@ class TestManager(TestCase): Manager(get_config_filename('dynamic-config.yaml')).sync( ['missing.zones.'] ) - self.assertTrue('Passed zone:' in str(ctx.exception)) + self.assertTrue('Requested zone:' in str(ctx.exception)) def test_missing_targets(self): with self.assertRaises(ManagerException) as ctx: From 98a11753994a5d3d80f84ec4db85a0deb819ba52 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 13 Dec 2023 08:25:00 -0800 Subject: [PATCH 6/6] Update tests/test_octodns_manager.py --- tests/test_octodns_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_octodns_manager.py b/tests/test_octodns_manager.py index b8f3c92..b93c9b8 100644 --- a/tests/test_octodns_manager.py +++ b/tests/test_octodns_manager.py @@ -84,7 +84,7 @@ class TestManager(TestCase): Manager(get_config_filename('dynamic-config.yaml')).sync( ['missing.zones.'] ) - self.assertTrue('Requested zone:' in str(ctx.exception)) + self.assertTrue('Requested zone ' in str(ctx.exception)) def test_missing_targets(self): with self.assertRaises(ManagerException) as ctx: