Merge pull request #2853 from bonicim/hotfix/8.1.3

Fix Ambient tests and load_config
VOLTTRON · Jan 12, 2022 · 5be3926 · 5be3926
2 parents 2f1c89d + d322baa
commit 5be3926
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/services/core/Ambient/tests/test_ambient_agent.py b/services/core/Ambient/tests/test_ambient_agent.py
@@ -124,6 +124,7 @@
                                                        "test_ambient_data.json"
                                                        " variable app_key")
 
+pytestmark = [pytestmark_api, pytestmark_app, pytestmark_locs]
 
 @pytest.fixture(scope="module")
 def query_agent(request, volttron_instance):

diff --git a/volttron/platform/agent/utils.py b/volttron/platform/agent/utils.py
@@ -156,7 +156,10 @@ def load_config(config_path):
     # Then if that fails we fallback to our modified json parser.
     try:
         with open(config_path) as f:
-            return yaml.safe_load(f.read())
+            config = yaml.safe_load(f.read())
+            if config is None:
+                return {}
+            return config
     except yaml.scanner.ScannerError as e:
         try:
             with open(config_path) as f: