From bac5447df148a8013950dd6877d77df84b5eba7c Mon Sep 17 00:00:00 2001 From: Craig <3979063+craig8@users.noreply.github.com> Date: Wed, 15 Dec 2021 09:02:52 -0800 Subject: [PATCH 1/2] Merge pull request #2840 from bonicim/bugfix/load_config Fix bug in load_config --- volttron/platform/agent/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/volttron/platform/agent/utils.py b/volttron/platform/agent/utils.py index 285722a486..1cff227b9b 100644 --- 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: From d322baacf812d8a431125b8ca1eb529d4ba73b5f Mon Sep 17 00:00:00 2001 From: Chandrika Date: Tue, 4 Jan 2022 16:30:51 -0800 Subject: [PATCH 2/2] Merge pull request #2850 from bonicim/update/tests-ambient Set pytestmark for Ambient tests --- services/core/Ambient/tests/test_ambient_agent.py | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/Ambient/tests/test_ambient_agent.py b/services/core/Ambient/tests/test_ambient_agent.py index b50ec44d53..6c7d56c448 100644 --- 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):