Skip to content
Snippets Groups Projects
Commit c8b0728a authored by I. Nüske's avatar I. Nüske
Browse files

MNT: Accept "" as a valid name in compare_entities

parent 3bd7191c
Branches
Tags
2 merge requests!175BUG: Request responses without the "Set-Cookie" header no longer overwrite the...,!165Compare_entities diff uses id instead of name where needed
Pipeline #58411 passed
...@@ -379,14 +379,15 @@ def compare_entities(entity0: Optional[Entity] = None, ...@@ -379,14 +379,15 @@ def compare_entities(entity0: Optional[Entity] = None,
# compare properties # compare properties
for prop in entity0.properties: for prop in entity0.properties:
key = prop.name if prop.name else prop.id # ToDo: Would making id default break anything? key = prop.name if prop.name is not None else prop.id # ToDo: Would making id default break anything?
matching = entity1.properties.filter(prop) matching = entity1.properties.filter(prop)
if len(matching) == 0: if len(matching) == 0:
# entity1 has prop, entity0 does not # entity1 has prop, entity0 does not
diff[0]["properties"][key] = {} diff[0]["properties"][key] = {}
elif len(matching) == 1: elif len(matching) == 1:
# It's possible that prop has name and id, but match only has id # It's possible that prop has name and id, but match only has id
key = prop.name if prop.name and matching[0].name else prop.id key = prop.name if (prop.name is not None and
matching[0].name is not None) else prop.id
diff[0]["properties"][key] = {} diff[0]["properties"][key] = {}
diff[1]["properties"][key] = {} diff[1]["properties"][key] = {}
propdiff = (diff[0]["properties"][key], propdiff = (diff[0]["properties"][key],
...@@ -431,7 +432,7 @@ def compare_entities(entity0: Optional[Entity] = None, ...@@ -431,7 +432,7 @@ def compare_entities(entity0: Optional[Entity] = None,
# we have not yet compared properties that do not exist in entity0 # we have not yet compared properties that do not exist in entity0
for prop in entity1.properties: for prop in entity1.properties:
key = prop.name if prop.name else prop.id # ToDo: Would making id default break anything? key = prop.name if prop.name is not None else prop.id # ToDo: Would making id default break anything?
# check how often the property appears in entity0 # check how often the property appears in entity0
num_prop_in_ent0 = len(entity0.properties.filter(prop)) num_prop_in_ent0 = len(entity0.properties.filter(prop))
if num_prop_in_ent0 == 0: if num_prop_in_ent0 == 0:
...@@ -447,7 +448,7 @@ def compare_entities(entity0: Optional[Entity] = None, ...@@ -447,7 +448,7 @@ def compare_entities(entity0: Optional[Entity] = None,
for index, parents, other_entity in [(0, entity0.parents, entity1), for index, parents, other_entity in [(0, entity0.parents, entity1),
(1, entity1.parents, entity0)]: (1, entity1.parents, entity0)]:
for parent in parents: for parent in parents:
key = parent.name if parent.name else parent.id # ToDo: Would making id default break anything? key = parent.name if parent.name is not None else parent.id # ToDo: Would making id default break anything?
matching = other_entity.parents.filter(parent) matching = other_entity.parents.filter(parent)
if len(matching) == 0: if len(matching) == 0:
diff[index]["parents"].append(key) diff[index]["parents"].append(key)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment