External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-06 05:48:06 -02:30
Code Issues Packages Projects Releases Wiki Activity

[fix] Now with doctest that actually passes

Browse Source
This commit is contained in:
Dominique Quatravaux
2020-10-29 14:03:19 +01:00
parent 87b97530ff
commit deb56bf4f8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/scheduler/kubernetes.py
View File

@@ -14,10 +14,12 @@ logger = logging.getLogger('awx.main.scheduler')
def deepmerge(a, b): def deepmerge(a, b):
""" """
Merge dict structures and return the result.
>>> a = {'first': {'all_rows': {'pass': 'dog', 'number': '1'}}} >>> a = {'first': {'all_rows': {'pass': 'dog', 'number': '1'}}}
>>> b = {'first': {'all_rows': {'fail': 'cat', 'number': '5'}}} >>> b = {'first': {'all_rows': {'fail': 'cat', 'number': '5'}}}
>>> deepmerge(b, a) == { 'first' : { 'all_rows' : { 'pass' : 'dog', 'fail' : 'cat', 'number' : '5' } } } >>> import pprint; pprint.pprint(deepmerge(a, b))
True {'first': {'all_rows': {'fail': 'cat', 'number': '5', 'pass': 'dog'}}}
""" """
if isinstance(a, dict) and isinstance(b, dict): if isinstance(a, dict) and isinstance(b, dict):
return dict([(k, deepmerge(a.get(k), b.get(k))) return dict([(k, deepmerge(a.get(k), b.get(k)))