Merge pull request #1066 from dmitriy-serdyuk/empty-config

Allow empty config file
mila-iqia · Apr 25, 2016 · 122a786 · 122a786
2 parents a79b336 + 1d2a1e8
commit 122a786
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 20 deletions.
diff --git a/blocks/config.py b/blocks/config.py
@@ -98,7 +98,8 @@ def load_yaml(self):
             yaml_file = os.path.expanduser('~/.blocksrc')
         if os.path.isfile(yaml_file) and os.path.getsize(yaml_file):
             with open(yaml_file) as f:
-                for key, value in yaml.safe_load(f).items():
+                config_dict = yaml.safe_load(f) or {}
+                for key, value in config_dict.items():
                     if key not in self.config:
                         raise ValueError("Unrecognized config in YAML: {}"
                                          .format(key))

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -6,22 +6,32 @@
 from blocks.config import Configuration, ConfigurationError
 
 
-def test_config():
-    _environ = dict(os.environ)
-    try:
-
-        with tempfile.NamedTemporaryFile(mode='w', delete=False) as f:
-            f.write('data_path: yaml_path')
-            filename = f.name
-        os.environ['BLOCKS_CONFIG'] = filename
-        if 'BLOCKS_DATA_PATH' in os.environ:
-            del os.environ['BLOCKS_DATA_PATH']
-        config = Configuration()
-        config.add_config('data_path', str, env_var='BLOCKS_DATA_PATH')
-        config.add_config('config_with_default', int, default='1',
-                          env_var='BLOCKS_CONFIG_TEST')
-        config.add_config('config_without_default', str)
-        config.load_yaml()
+def load_config(contents):
+    with tempfile.NamedTemporaryFile(mode='w', delete=False) as f:
+        f.write(contents)
+        filename = f.name
+    os.environ['BLOCKS_CONFIG'] = filename
+    if 'BLOCKS_DATA_PATH' in os.environ:
+        del os.environ['BLOCKS_DATA_PATH']
+    config = Configuration()
+    config.add_config('data_path', str, env_var='BLOCKS_DATA_PATH')
+    config.add_config('config_with_default', int, default='1',
+                      env_var='BLOCKS_CONFIG_TEST')
+    config.add_config('config_without_default', str)
+    config.load_yaml()
+    return config
+
+
+class TestConfig(object):
+    def setUp(self):
+        self._environ = dict(os.environ)
+
+    def tearDown(self):
+        os.environ.clear()
+        os.environ.update(self._environ)
+
+    def test_config(self):
+        config = load_config('data_path: yaml_path')
         assert config.data_path == 'yaml_path'
         os.environ['BLOCKS_DATA_PATH'] = 'env_path'
         assert config.data_path == 'env_path'
@@ -36,6 +46,6 @@ def test_config():
         assert config.data_path == 'manual_path'
         config.new_config = 'new_config'
         assert config.new_config == 'new_config'
-    finally:
-        os.environ.clear()
-        os.environ.update(_environ)
+
+    def test_empty_config(self):
+        load_config('')