From 02296652cab2d0ea4096349587f53d1d1b630f7e Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 16 Feb 2022 15:23:55 -0800 Subject: [PATCH] WIP: Backing out a more test churn now that YamlProvider has SUPPORTS_ROOT_NS flag --- octodns/manager.py | 1 - tests/config/simple.yaml | 1 + tests/test_octodns_manager.py | 3 +-- tests/test_octodns_provider_yaml.py | 16 ++++++++++------ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/octodns/manager.py b/octodns/manager.py index d7b1932..c8a4263 100644 --- a/octodns/manager.py +++ b/octodns/manager.py @@ -522,7 +522,6 @@ class Manager(object): plan = target.plan(zone) if plan is None: plan = Plan(zone, zone, [], False) - # We require at least root NS so there'll always be a plan target.apply(plan) def validate_configs(self): diff --git a/tests/config/simple.yaml b/tests/config/simple.yaml index af54fc9..fc4ad9f 100644 --- a/tests/config/simple.yaml +++ b/tests/config/simple.yaml @@ -4,6 +4,7 @@ providers: in: class: octodns.provider.yaml.YamlProvider directory: tests/config + supports_root_ns: False dump: class: octodns.provider.yaml.YamlProvider directory: env/YAML_TMP_DIR diff --git a/tests/test_octodns_manager.py b/tests/test_octodns_manager.py index e558dfe..1e65386 100644 --- a/tests/test_octodns_manager.py +++ b/tests/test_octodns_manager.py @@ -301,8 +301,7 @@ class TestManager(TestCase): with open(join(tmpdir.dirname, 'empty.yaml')) as fh: data = safe_load(fh, False) - # just to root NS - self.assertEqual(0, len(data)) + self.assertFalse(data) def test_dump_split(self): with TemporaryDirectory() as tmpdir: diff --git a/tests/test_octodns_provider_yaml.py b/tests/test_octodns_provider_yaml.py index f810493..51e55eb 100644 --- a/tests/test_octodns_provider_yaml.py +++ b/tests/test_octodns_provider_yaml.py @@ -82,11 +82,15 @@ class TestYamlProvider(TestCase): [x for x in reloaded.records if x.name == 'included'][0]._octodns) + # manually copy over the root since it will have been ignored + # when things were written out + reloaded.add_record(zone.root_ns) + self.assertFalse(zone.changes(reloaded, target=source)) # A 2nd sync should still create everything plan = target.plan(zone) - self.assertEqual(21, len([c for c in plan.changes + self.assertEqual(20, len([c for c in plan.changes if isinstance(c, Create)])) with open(yaml_file) as fh: @@ -152,10 +156,6 @@ class TestYamlProvider(TestCase): self.assertTrue('value' in dyna) # self.assertTrue('dynamic' in dyna) - dyna = data.pop('') - self.assertTrue('values' in dyna) - # self.assertTrue('dynamic' in dyna) - # make sure nothing is left self.assertEqual([], list(data.keys())) @@ -295,11 +295,15 @@ class TestSplitYamlProvider(TestCase): [x for x in reloaded.records if x.name == 'included'][0]._octodns) + # manually copy over the root since it will have been ignored + # when things were written out + reloaded.add_record(zone.root_ns) + self.assertFalse(zone.changes(reloaded, target=source)) # A 2nd sync should still create everything plan = target.plan(zone) - self.assertEqual(18, len([c for c in plan.changes + self.assertEqual(17, len([c for c in plan.changes if isinstance(c, Create)])) yaml_file = join(zone_dir, '$unit.tests.yaml')