Fix out_graph logic; predictable results for testing graph output.

lakesuperior/model/ldpr.py

@@ -373,26 +373,21 @@ class Ldpr(metaclass=ABCMeta):
 
         for t in self.imr.graph:
             if (
-                # Do not include digest hash and version information.
-                t[1] in {
+                # Exclude digest hash and version information.
+                t[1] not in {
                     nsc['premis'].hasMessageDigest,
                     nsc['fcrepo'].hasVersion,
                 }
-            ) or (
-                # Do not include server managed triples if explicitily omitted.
-                not self._imr_options.get('incl_srv_mgd', True)
-                and t[1] in srv_mgd_predicates
-                or t in srv_mgd_types
+            ) and (
+                # Only include server managed triples if requested.
+                self._imr_options.get('incl_srv_mgd', True)
+                or (
+                    not t[1] in srv_mgd_predicates
+                    and not (t[1] == RDF.type or t[2] in srv_mgd_types)
+                )
             ):
-                pass
-            else:
                 out_gr.add(t)
 
-        out_gr = self.imr.graph
-        # Clear IMR because it's been pruned. In the rare case it is needed
-        # after this method, it will be retrieved again.
-        delattr(self, 'imr')
-
         return out_gr
 
 

tests/endpoints/test_ldp.py

@@ -5,6 +5,7 @@ from hashlib import sha1
 
 from flask import g
 from rdflib import Graph
+from rdflib.compare import isomorphic
 from rdflib.namespace import RDF
 from rdflib.term import Literal, URIRef
 
@@ -471,11 +472,12 @@ class TestPrefHeader:
                     .format(Ldpr.RETURN_CHILD_RES_URI),
         })
 
-        assert incl_children_resp.data == cont_resp.data
-
+        default_gr = Graph().parse(data=cont_resp.data, format='turtle')
         incl_gr = Graph().parse(data=incl_children_resp.data, format='turtle')
         omit_gr = Graph().parse(data=omit_children_resp.data, format='turtle')
 
+        assert isomorphic(incl_gr, default_gr)
+
         children = incl_gr[cont_subject : nsc['ldp'].contains]
         for child_uri in children:
             assert not omit_gr[ cont_subject : nsc['ldp'].contains : child_uri ]
@@ -498,11 +500,11 @@ class TestPrefHeader:
                     .format(Ldpr.RETURN_INBOUND_REF_URI),
         })
 
-        assert omit_inbound_resp.data == cont_resp.data
-
+        default_gr = Graph().parse(data=cont_resp.data, format='turtle')
         incl_gr = Graph().parse(data=incl_inbound_resp.data, format='turtle')
         omit_gr = Graph().parse(data=omit_inbound_resp.data, format='turtle')
 
+        assert isomorphic(omit_gr, default_gr)
         assert set(incl_gr[ : : cont_subject ])
         assert not set(omit_gr[ : : cont_subject ])
 
@@ -536,6 +538,7 @@ class TestPrefHeader:
             nsc['fcrepo'].lastModifiedBy,
             nsc['ldp'].contains,
         }:
+
             assert set(incl_gr[ cont_subject : pred : ])
             assert not set(omit_gr[ cont_subject : pred : ])