<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18826">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">config: Allow empty config files<br><br>Change-Id: Ic010e06220421df00405c5b6f5ad2e83514b6dcd<br>---<br>M src/osmo_gsm_tester/core/config.py<br>M src/osmo_gsm_tester/core/resource.py<br>2 files changed, 4 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/core/config.py b/src/osmo_gsm_tester/core/config.py</span><br><span>index 398e8ba..a8860d3 100644</span><br><span>--- a/src/osmo_gsm_tester/core/config.py</span><br><span>+++ b/src/osmo_gsm_tester/core/config.py</span><br><span>@@ -137,6 +137,8 @@</span><br><span>     global MAIN_CONFIG</span><br><span>     if MAIN_CONFIG is None:</span><br><span>         cfg = read(_get_main_config_path(), MAIN_CONFIG_SCHEMA)</span><br><span style="color: hsl(120, 100%, 40%);">+        if cfg is None:</span><br><span style="color: hsl(120, 100%, 40%);">+            cfg = {}</span><br><span>         MAIN_CONFIG = {</span><br><span>             CFG_STATE_DIR: DF_CFG_STATE_DIR,</span><br><span>             CFG_SUITES_DIR: DF_CFG_SUITES_DIR,</span><br><span>@@ -195,7 +197,7 @@</span><br><span>     with open(path, 'r') as f:</span><br><span>         config = yaml.safe_load(f)</span><br><span>     config = _standardize(config)</span><br><span style="color: hsl(0, 100%, 40%);">-    if validation_schema:</span><br><span style="color: hsl(120, 100%, 40%);">+    if config and validation_schema:</span><br><span>         schema.validate(config, validation_schema)</span><br><span>     return config</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/core/resource.py b/src/osmo_gsm_tester/core/resource.py</span><br><span>index af05a51..62bba07 100644</span><br><span>--- a/src/osmo_gsm_tester/core/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/core/resource.py</span><br><span>@@ -54,7 +54,7 @@</span><br><span>         self.read_conf()</span><br><span> </span><br><span>     def read_conf(self):</span><br><span style="color: hsl(0, 100%, 40%);">-        self.all_resources = Resources(config.read(self.config_path, schema.get_resources_schema()))</span><br><span style="color: hsl(120, 100%, 40%);">+        self.all_resources = Resources(config.read(self.config_path, schema.get_resources_schema()) or {})</span><br><span>         self.all_resources.set_hashes()</span><br><span> </span><br><span>     def reserve(self, origin, want, modifiers):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18826">change 18826</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18826"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic010e06220421df00405c5b6f5ad2e83514b6dcd </div>
<div style="display:none"> Gerrit-Change-Number: 18826 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>