Change in osmo-gsm-tester[master]: config: Fix reading empty yaml default-suites.conf

[pespin]

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


Change subject: config: Fix reading empty yaml default-suites.conf
......................................................................

config: Fix reading empty yaml default-suites.conf

during config.read(), on empty file yaml.safe_load() returns None, which
was then later converted to string "None" by _standardize(), and
osmo-gsm-tester.py was not catching "not combination_strs" condition.

Change-Id: I07d7daab8f8f4238db140f0a0311f3d1d41e6cb0
---
M src/osmo_gsm_tester/config.py
1 file changed, 2 insertions(+), 0 deletions(-)



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

diff --git a/src/osmo_gsm_tester/config.py b/src/osmo_gsm_tester/config.py
index 7f1e52f..87b3da4 100644
--- a/src/osmo_gsm_tester/config.py
+++ b/src/osmo_gsm_tester/config.py
@@ -176,6 +176,8 @@
     return yaml.dump(config, default_flow_style=False)
 
 def _standardize_item(item):
+    if item is None:
+        return None
     if isinstance(item, (tuple, list)):
         return [_standardize_item(i) for i in item]
     if isinstance(item, dict):

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17212
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: I07d7daab8f8f4238db140f0a0311f3d1d41e6cb0
Gerrit-Change-Number: 17212
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/20200218/52ce06b4/attachment.htm>