Change in osmo-gsm-tester[master]: fixup

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18827 )


Change subject: fixup
......................................................................

fixup

Change-Id: I2273ad35644cac83ef427ebc98d6a802f35dbddd
---
M src/osmo_gsm_tester/core/config.py
M src/osmo_gsm_tester/core/resource.py
2 files changed, 3 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/27/18827/1

diff --git a/src/osmo_gsm_tester/core/config.py b/src/osmo_gsm_tester/core/config.py
index ecec8e3..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,
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):

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18827
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I2273ad35644cac83ef427ebc98d6a802f35dbddd
Gerrit-Change-Number: 18827
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200615/3e2fe409/attachment.htm>