commit e66e3aebb475b6e30c7f4f21565bb218409158d1
author Pau Espin Pedrol <pespin@sysmocom.de> Mon Jun 15 13:57:54 2020 +0200
committer Pau Espin Pedrol <pespin@sysmocom.de> Mon Jun 15 14:28:00 2020 +0200
tree f4e462caf2baaebd45d7a9cad55d7b716a79a4a6
parent 683d19653237efc9b03962b0724706619c0d0a6c

config: Allow empty config files

Change-Id: Ic010e06220421df00405c5b6f5ad2e83514b6dcd

src/osmo_gsm_tester/core/config.py

diff --git a/src/osmo_gsm_tester/core/config.py b/src/osmo_gsm_tester/core/config.py
index 398e8ba..a8860d3 100644
--- a/src/osmo_gsm_tester/core/config.py
+++ b/src/osmo_gsm_tester/core/config.py
@@ -137,6 +137,8 @@
     global MAIN_CONFIG
     if MAIN_CONFIG is None:
         cfg = read(_get_main_config_path(), MAIN_CONFIG_SCHEMA)
+        if cfg is None:
+            cfg = {}
         MAIN_CONFIG = {
             CFG_STATE_DIR: DF_CFG_STATE_DIR,
             CFG_SUITES_DIR: DF_CFG_SUITES_DIR,
@@ -195,7 +197,7 @@
     with open(path, 'r') as f:
         config = yaml.safe_load(f)
     config = _standardize(config)
-    if validation_schema:
+    if config and validation_schema:
         schema.validate(config, validation_schema)
     return config
 

src/osmo_gsm_tester/core/resource.py

diff --git a/src/osmo_gsm_tester/core/resource.py b/src/osmo_gsm_tester/core/resource.py
index af05a51..62bba07 100644
--- a/src/osmo_gsm_tester/core/resource.py
+++ b/src/osmo_gsm_tester/core/resource.py
@@ -54,7 +54,7 @@
         self.read_conf()
 
     def read_conf(self):
-        self.all_resources = Resources(config.read(self.config_path, schema.get_resources_schema()))
+        self.all_resources = Resources(config.read(self.config_path, schema.get_resources_schema()) or {})
         self.all_resources.set_hashes()
 
     def reserve(self, origin, want, modifiers):