WIP: Backing out a more test churn now that YamlProvider has SUPPORTS_ROOT_NS flag

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):

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

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:

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')