Merge pull request #42 from uber/yl-fix-empty-fixture-file

make FixturesManager work with empty fixture file
uber · Mar 3, 2015 · d0e25ff · d0e25ff
2 parents 5526dda + f3ac9f1
commit d0e25ff
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 25 deletions.
diff --git a/charlatan/fixtures_manager.py b/charlatan/fixtures_manager.py
@@ -126,31 +126,32 @@ def _load_fixtures(self, filenames, models_package=''):
                     "objects": load_file(filename, self.use_unicode)
                 }
 
-        for k, v in _compat.iteritems(content):
-
-            if "objects" in v:
-                # It's a collection of fictures.
-                collection = self._handle_collection(
-                    namespace=k,
-                    definition=v,
-                    objects=v["objects"],
-                    models_package=models_package,
-                )
-                self.collection.add(k, collection)
-
-            # Named fixtures
-            else:
-                if "id" in v:
-                    # Renaming id because it's a Python builtin function
-                    v["id_"] = v["id"]
-                    del v["id"]
-
-                fixture = Fixture(
-                    key=k,
-                    fixture_manager=self,
-                    models_package=models_package,
-                    **v)
-                self.collection.add(k, fixture)
+        if content:
+            for k, v in _compat.iteritems(content):
+
+                if "objects" in v:
+                    # It's a collection of fictures.
+                    collection = self._handle_collection(
+                        namespace=k,
+                        definition=v,
+                        objects=v["objects"],
+                        models_package=models_package,
+                    )
+                    self.collection.add(k, collection)
+
+                # Named fixtures
+                else:
+                    if "id" in v:
+                        # Renaming id because it's a Python builtin function
+                        v["id_"] = v["id"]
+                        del v["id"]
+
+                    fixture = Fixture(
+                        key=k,
+                        fixture_manager=self,
+                        models_package=models_package,
+                        **v)
+                    self.collection.add(k, fixture)
 
         graph = self._check_cycle(self.collection)
         return graph

diff --git a/charlatan/tests/data/empty.yaml b/charlatan/tests/data/empty.yaml
diff --git a/charlatan/tests/test_fixtures_manager.py b/charlatan/tests/test_fixtures_manager.py
@@ -29,6 +29,12 @@ def test_load_two_files(self):
             './charlatan/tests/data/simple.yaml')
         assert 'simple_dict' in manager.keys()
 
+    def test_load_empty_file(self):
+        """Verify we can load a emtpy file."""
+        manager = FixturesManager()
+        manager.load('./charlatan/tests/data/empty.yaml')
+        self.assertEqual(list(manager.keys()), [])
+
     def test_install_fixture(self):
         """install_fixture should return the fixture."""
         manager = FixturesManager()