diff --git a/src/caoscrawler/identifiable_adapters.py b/src/caoscrawler/identifiable_adapters.py index 98281c4d8a8b25bff52dfef527712a015764b008..6169a99e7bf47daffb53332b7e0b6513730f2561 100644 --- a/src/caoscrawler/identifiable_adapters.py +++ b/src/caoscrawler/identifiable_adapters.py @@ -45,12 +45,13 @@ from .utils import has_parent logger = logging.getLogger(__name__) -def _retrieve_RecordType(id=None, name =None): +def _retrieve_RecordType(id=None, name=None): """ Retrieve the RecordType from LinkAhead. For mocking purposes. """ return db.RecordType(name=name, id=id).retrieve() + def get_children_of_rt(rtname): """Supply the name of a recordtype. This name and the name of all children RTs are returned in a list""" @@ -658,8 +659,7 @@ class CaosDBIdentifiableAdapter(IdentifiableAdapter): return registered[0] else: return None - - + def _get_registered_for_rt(self, rt: db.RecordType): """ returns the registered identifiable for the given RecordType or the @@ -681,9 +681,6 @@ class CaosDBIdentifiableAdapter(IdentifiableAdapter): return registered[0] else: return None - - - def retrieve_identified_record_for_identifiable(self, identifiable: Identifiable): query_string = self.create_query_for_identifiable(identifiable) diff --git a/unittests/test_crawler.py b/unittests/test_crawler.py index def00e41d7a2b95bd1a87187623cf34555471137..bdb22ba2171c6d52633c4429d98735e560cf6375 100644 --- a/unittests/test_crawler.py +++ b/unittests/test_crawler.py @@ -371,8 +371,9 @@ def test_split_into_inserts_and_updates_with_circ(crawler_mocked_identifiable_re with pytest.raises(RuntimeError): crawler._split_into_inserts_and_updates(st) -@patch("caoscrawler.identifiable_adapters._retrieve_RecordType", - new=Mock(side_effect=lambda id, name: db.RecordType(id=id,name=name))) + +@patch("caoscrawler.identifiable_adapters._retrieve_RecordType", + new=Mock(side_effect=lambda id, name: db.RecordType(id=id, name=name))) def test_split_into_inserts_and_updates_with_complex(crawler_mocked_identifiable_retrieve): crawler = crawler_mocked_identifiable_retrieve # A @@ -400,8 +401,9 @@ def test_split_into_inserts_and_updates_with_complex(crawler_mocked_identifiable # TODO write test where the unresoled entity is not part of the identifiable -@patch("caoscrawler.identifiable_adapters._retrieve_RecordType", - new=Mock(side_effect=lambda id, name: db.RecordType(id=id,name=name))) + +@patch("caoscrawler.identifiable_adapters._retrieve_RecordType", + new=Mock(side_effect=lambda id, name: db.RecordType(id=id, name=name))) @patch("caoscrawler.crawl.cached_get_entity_by", new=Mock(side_effect=mock_get_entity_by)) @patch("caoscrawler.identifiable_adapters.cached_query", @@ -584,8 +586,9 @@ def test_split_into_inserts_and_updates_diff_backref(crawler_mocked_for_backref_ assert len(update) == 2 assert len(insert) == 1 -@patch("caoscrawler.identifiable_adapters._retrieve_RecordType", - new=Mock(side_effect=lambda id, name: db.RecordType(id=id,name=name))) + +@patch("caoscrawler.identifiable_adapters._retrieve_RecordType", + new=Mock(side_effect=lambda id, name: db.RecordType(id=id, name=name))) def test_replace_entities_with_ids(): crawler = Crawler() a = (db.Record().add_parent("B").add_property("A", 12345) @@ -598,8 +601,8 @@ def test_replace_entities_with_ids(): assert a.get_property("C").value == [12345, 233324] -@patch("caoscrawler.identifiable_adapters._retrieve_RecordType", - new=Mock(side_effect=lambda id, name: db.RecordType(id=id,name=name))) +@patch("caoscrawler.identifiable_adapters._retrieve_RecordType", + new=Mock(side_effect=lambda id, name: db.RecordType(id=id, name=name))) @patch("caoscrawler.crawl.cached_get_entity_by", new=Mock(side_effect=mock_get_entity_by)) @patch("caoscrawler.identifiable_adapters.cached_get_entity_by", @@ -625,8 +628,8 @@ def test_synchronization_no_commit(upmock, insmock): assert len(ups) == 1 -@patch("caoscrawler.identifiable_adapters._retrieve_RecordType", - new=Mock(side_effect=lambda id, name: db.RecordType(id=id,name=name))) +@patch("caoscrawler.identifiable_adapters._retrieve_RecordType", + new=Mock(side_effect=lambda id, name: db.RecordType(id=id, name=name))) @patch("caoscrawler.crawl.cached_get_entity_by", new=Mock(side_effect=mock_get_entity_by)) @patch("caoscrawler.identifiable_adapters.cached_get_entity_by",