Skip to content

Commit

Permalink
fix: linting and formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
exaby73 committed Aug 4, 2023
1 parent cbd466b commit 583ed9f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
1 change: 1 addition & 0 deletions src/firebase_functions/private/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def prune_nones(obj: dict) -> dict:
prune_nones(obj[key])
return obj


def deep_merge(dict1, dict2):
result = dict1.copy()
for key, value in dict2.items():
Expand Down
24 changes: 12 additions & 12 deletions tests/test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,24 +124,24 @@ def test_normalize_document_path():


def test_toplevel_keys():
dict1 = {'baz': {'answer': 42, 'qux': 'quux'}, 'foo': 'bar'}
dict2 = {'baz': {'answer': 33}}
dict1 = {"baz": {"answer": 42, "qux": "quux"}, "foo": "bar"}
dict2 = {"baz": {"answer": 33}}
result = deep_merge(dict1, dict2)
assert 'foo' in result
assert 'baz' in result
assert "foo" in result
assert "baz" in result


def test_nested_merge():
dict1 = {'baz': {'answer': 42, 'qux': 'quux'}, 'foo': 'bar'}
dict2 = {'baz': {'answer': 33}}
dict1 = {"baz": {"answer": 42, "qux": "quux"}, "foo": "bar"}
dict2 = {"baz": {"answer": 33}}
result = deep_merge(dict1, dict2)
assert result['baz']['answer'] == 33
assert result['baz']['qux'] == 'quux'
assert result["baz"]["answer"] == 33
assert result["baz"]["qux"] == "quux"


def test_does_not_modify_originals():
dict1 = {'baz': {'answer': 42, 'qux': 'quux'}, 'foo': 'bar'}
dict2 = {'baz': {'answer': 33}}
dict1 = {"baz": {"answer": 42, "qux": "quux"}, "foo": "bar"}
dict2 = {"baz": {"answer": 33}}
deep_merge(dict1, dict2)
assert dict1['baz']['answer'] == 42
assert dict2['baz']['answer'] == 33
assert dict1["baz"]["answer"] == 42
assert dict2["baz"]["answer"] == 33

0 comments on commit 583ed9f

Please sign in to comment.