Return boolean from unit test instead of raising an exception as expe…

…cted by create_db

iyp/__init__.py

@@ -715,14 +715,17 @@ def unit_test(self, relation_types):
         relation_types should be a list of types for which existence is checked.
         """
         logging.info(f'Running existence test for {relation_types}')
+        passed = True
         for relation_type in relation_types:
             existenceQuery = f"""MATCH ()-[r:{relation_type}]-()
                                 USING INDEX r:{relation_type}(reference_name)
                                 WHERE r.reference_name = '{self.reference['reference_name']}'
                                 RETURN 0 LIMIT 1"""
             result = self.iyp.tx.run(existenceQuery)
             if len(list(result)) == 0:
-                raise RuntimeError(f'Missing data for relation {relation_type}')
+                passed = False
+                logging.error(f'Missing data for relation {relation_type}')
+        return passed
 
     def close(self):
         # Commit changes to IYP

iyp/crawlers/alice_lg/__init__.py

@@ -444,4 +444,4 @@ def run(self) -> None:
             self.iyp.batch_add_links('ORIGINATE', originate_rels)
 
     def unit_test(self):
-        super().unit_test(['MEMBER_OF', 'ORIGINATE', 'MANAGED_BY'])
+        return super().unit_test(['MEMBER_OF', 'ORIGINATE', 'MANAGED_BY'])

iyp/crawlers/apnic/eyeball.py

@@ -85,7 +85,7 @@ def run(self):
             self.iyp.batch_add_links('POPULATION', pop_links)
 
     def unit_test(self):
-        super().unit_test(['POPULATION', 'COUNTRY', 'RANK', 'NAME'])
+        return super().unit_test(['POPULATION', 'COUNTRY', 'RANK', 'NAME'])
 
 
 def main() -> None:

iyp/crawlers/bgpkit/__init__.py

@@ -49,4 +49,4 @@ def run(self):
         self.iyp.batch_add_links('PEERS_WITH', links)
 
     def unit_test(self):
-        super().unit_test(['PEERS_WITH'])
+        return super().unit_test(['PEERS_WITH'])

iyp/crawlers/bgpkit/peerstats.py

@@ -91,7 +91,7 @@ def run(self):
             self.iyp.batch_add_links('PEERS_WITH', links)
 
     def unit_test(self):
-        super().unit_test(['PEERS_WITH'])
+        return super().unit_test(['PEERS_WITH'])
 
 
 def main() -> None:

iyp/crawlers/bgpkit/pfx2asn.py

@@ -63,7 +63,7 @@ def run(self):
         self.iyp.batch_add_links('ORIGINATE', links)
 
     def unit_test(self):
-        super().unit_test(['ORIGINATE'])
+        return super().unit_test(['ORIGINATE'])
 
 
 def main() -> None:

iyp/crawlers/bgptools/anycast_prefixes.py

@@ -103,7 +103,7 @@ def update(self, res, filename: str):
             self.iyp.batch_add_links('CATEGORIZED', links)
 
     def unit_test(self):
-        super().unit_test(['CATEGORIZED'])
+        return super().unit_test(['CATEGORIZED'])
 
 
 def main() -> None:

iyp/crawlers/bgptools/as_names.py

@@ -86,7 +86,7 @@ def run(self):
         self.iyp.batch_add_links('CATEGORIZED', tag_links)
 
     def unit_test(self):
-        super().unit_test(['NAME'])
+        return super().unit_test(['NAME'])
 
 
 def main() -> None:

iyp/crawlers/bgptools/tags.py

@@ -84,7 +84,7 @@ def run(self):
                     print(error)
 
     def unit_test(self):
-        super().unit_test(['CATEGORIZED'])
+        return super().unit_test(['CATEGORIZED'])
 
 
 def main() -> None:

iyp/crawlers/caida/asrank.py

@@ -101,7 +101,7 @@ def run(self):
         self.iyp.batch_add_links('RANK', rank_links)
 
     def unit_test(self):
-        super().unit_test(['NAME', 'COUNTRY', 'RANK'])
+        return super().unit_test(['NAME', 'COUNTRY', 'RANK'])
 
 
 def main() -> None:

iyp/crawlers/caida/ix_asns.py

@@ -91,7 +91,7 @@ def run(self):
         self.iyp.batch_add_links('MEMBER_OF', member_links)
 
     def unit_test(self):
-        super().unit_test(['MEMBER_OF'])
+        return super().unit_test(['MEMBER_OF'])
 
 
 def main() -> None:

iyp/crawlers/caida/ixs.py

@@ -201,7 +201,7 @@ def run(self):
         self.iyp.batch_add_links('MANAGED_BY', prefix_links)
 
     def unit_test(self):
-        super().unit_test(['EXTERNAL_ID', 'NAME', 'COUNTRY', 'WEBSITE', 'MANAGED_BY'])
+        return super().unit_test(['EXTERNAL_ID', 'NAME', 'COUNTRY', 'WEBSITE', 'MANAGED_BY'])
 
 
 def main() -> None:

iyp/crawlers/cisco/umbrella_top1m.py

@@ -124,7 +124,7 @@ def run(self):
         self.iyp.batch_add_links('RANK', processed_links)
 
     def unit_test(self):
-        super().unit_test(['RANK'])
+        return super().unit_test(['RANK'])
 
 
 def main() -> None:

iyp/crawlers/citizenlab/urldb.py

@@ -71,7 +71,7 @@ def run(self):
         self.iyp.batch_add_links('CATEGORIZED', links)
 
     def unit_test(self):
-        super().unit_test(['CATEGORIZED'])
+        return super().unit_test(['CATEGORIZED'])
 
 
 def main() -> None:

iyp/crawlers/cloudflare/dns_top_locations.py

@@ -169,7 +169,7 @@ def compute_link(self, param):
             })
 
     def unit_test(self):
-        super().unit_test(['QUERIED_FROM'])
+        return super().unit_test(['QUERIED_FROM'])
 
 
 def main() -> None:

iyp/crawlers/cloudflare/ranking_bucket.py

@@ -123,7 +123,7 @@ def run(self):
                 self.iyp.batch_add_links('RANK', domain_links)
 
     def unit_test(self):
-        super().unit_test(['RANK'])
+        return super().unit_test(['RANK'])
 
 
 # Main program

iyp/crawlers/cloudflare/top100.py

@@ -72,7 +72,7 @@ def update(self, entry):
         self.iyp.add_links(domain_qid, statements)
 
     def unit_test(self):
-        super().unit_test(['RANK'])
+        return super().unit_test(['RANK'])
 
 
 def main() -> None:

iyp/crawlers/emileaben/as_names.py

@@ -67,7 +67,7 @@ def run(self):
             self.iyp.batch_add_links('NAME', links)
 
     def unit_test(self):
-        super().unit_test(['NAME'])
+        return super().unit_test(['NAME'])
 
 
 def main() -> None:

iyp/crawlers/iana/root_zone.py

@@ -108,7 +108,7 @@ def run(self):
         self.iyp.batch_add_links('MANAGED_BY', managed_by_relationships)
 
     def unit_test(self):
-        super().unit_test(['RESOLVES_TO', 'MANAGED_BY'])
+        return super().unit_test(['RESOLVES_TO', 'MANAGED_BY'])
 
 
 def main() -> None:

iyp/crawlers/ihr/__init__.py

@@ -103,4 +103,4 @@ def run(self):
         os.remove(local_filename)
 
     def unit_test(self):
-        super().unit_test(['DEPENDS_ON'])
+        return super().unit_test(['DEPENDS_ON'])

iyp/crawlers/ihr/country_dependency.py

@@ -115,7 +115,7 @@ def run(self):
             self.iyp.batch_add_links('RANK', links)
 
     def unit_test(self):
-        super().unit_test(['RANK', 'COUNTRY'])
+        return super().unit_test(['RANK', 'COUNTRY'])
 
 
 # Main program

iyp/crawlers/ihr/rov.py

@@ -177,7 +177,7 @@ def run(self):
         os.remove(local_filename)
 
     def unit_test(self):
-        super().unit_test(['ORIGINATE', 'CATEGORIZED', 'DEPENDS_ON', 'COUNTRY'])
+        return super().unit_test(['ORIGINATE', 'CATEGORIZED', 'DEPENDS_ON', 'COUNTRY'])
 
 
 def main() -> None:

iyp/crawlers/inetintel/as_org.py

@@ -186,7 +186,7 @@ def close(self):
         os.rmdir(self.tmpdir)
 
     def unit_test(self):
-        super().unit_test(['SIBLING_OF'])
+        return super().unit_test(['SIBLING_OF'])
 
 
 def main() -> None:

iyp/crawlers/manrs/members.py

@@ -130,7 +130,7 @@ def run(self):
         self.iyp.batch_add_links('IMPLEMENT', implement_rels)
 
     def unit_test(self):
-        super().unit_test(['MEMBER_OF', 'IMPLEMENT', 'COUNTRY'])
+        return super().unit_test(['MEMBER_OF', 'IMPLEMENT', 'COUNTRY'])
 
 
 def main() -> None:

iyp/crawlers/nro/delegated_stats.py

@@ -198,7 +198,7 @@ def run(self):
             self.iyp.batch_add_links(label, links)
 
     def unit_test(self):
-        super().unit_test(['AVAILABLE', 'ASSIGNED', 'RESERVED', 'COUNTRY'])
+        return super().unit_test(['AVAILABLE', 'ASSIGNED', 'RESERVED', 'COUNTRY'])
 
 
 def main() -> None:

iyp/crawlers/openintel/__init__.py

@@ -241,7 +241,7 @@ def run(self):
 
     def unit_test(self):
         # use different version depending on infra_ns vs others
-        super().unit_test(['RESOLVES_TO', 'MANAGED_BY', 'PART_OF'])
+        return super().unit_test(['RESOLVES_TO', 'MANAGED_BY', 'PART_OF'])
 
 
 class DnsgraphCrawler(BaseCrawler):
@@ -388,4 +388,4 @@ def run(self):
         self.iyp.batch_add_node_label(ns_id, 'AuthoritativeNameServer')
 
     def unit_test(self):
-        super().unit_test(['PARENT', 'PART_OF', 'ALIAS_OF', 'MANAGED_BY', 'RESOLVES_TO'])
+        return super().unit_test(['PARENT', 'PART_OF', 'ALIAS_OF', 'MANAGED_BY', 'RESOLVES_TO'])

iyp/crawlers/pch/__init__.py

@@ -328,4 +328,4 @@ def run(self) -> None:
         self.cache_handler.clear_cache()
 
     def unit_test(self):
-        super().unit_test(['ORIGINATE'])
+        return super().unit_test(['ORIGINATE'])

iyp/crawlers/peeringdb/fac.py

@@ -132,7 +132,7 @@ def run(self):
         self.iyp.batch_add_links('MANAGED_BY', org_links)
 
     def unit_test(self):
-        super().unit_test(['NAME', 'WEBSITE', 'COUNTRY', 'EXTERNAL_ID', 'MANAGED_BY'])
+        return super().unit_test(['NAME', 'WEBSITE', 'COUNTRY', 'EXTERNAL_ID', 'MANAGED_BY'])
 
 
 def main() -> None:

iyp/crawlers/peeringdb/ix.py

@@ -394,7 +394,7 @@ def register_ixs(self):
         self.iyp.batch_add_links('NAME', name_links)
 
     def unit_test(self):
-        super().unit_test(['MANAGED_BY', 'LOCATED_IN', 'COUNTRY', 'WEBSITE', 'EXTERNAL_ID', 'NAME'])
+        return super().unit_test(['MANAGED_BY', 'LOCATED_IN', 'COUNTRY', 'WEBSITE', 'EXTERNAL_ID', 'NAME'])
 
 
 def main() -> None:

iyp/crawlers/peeringdb/org.py

@@ -120,7 +120,7 @@ def run(self):
         self.iyp.batch_add_links('EXTERNAL_ID', orgid_links)
 
     def unit_test(self):
-        super().unit_test(['NAME', 'WEBSITE', 'COUNTRY', 'EXTERNAL_ID'])
+        return super().unit_test(['NAME', 'WEBSITE', 'COUNTRY', 'EXTERNAL_ID'])
 
 
 def main() -> None:

iyp/crawlers/ripe/as_names.py

@@ -70,7 +70,7 @@ def run(self):
         self.iyp.batch_add_links('COUNTRY', country_links)
 
     def unit_test(self):
-        super().unit_test(['NAME', 'COUNTRY'])
+        return super().unit_test(['NAME', 'COUNTRY'])
 
 
 def main() -> None:

iyp/crawlers/ripe/atlas_measurements.py

@@ -259,7 +259,7 @@ def run(self):
         logging.info('Done.')
 
     def unit_test(self):
-        super().unit_test(['PART_OF', 'TARGET'])
+        return super().unit_test(['PART_OF', 'TARGET'])
 
 
 def main() -> None:

iyp/crawlers/ripe/atlas_probes.py

@@ -176,7 +176,7 @@ def run(self):
         self.iyp.batch_add_links('COUNTRY', country_links)
 
     def unit_test(self):
-        super().unit_test(['ASSIGNED', 'LOCATED_IN', 'COUNTRY'])
+        return super().unit_test(['ASSIGNED', 'LOCATED_IN', 'COUNTRY'])
 
 
 def main() -> None:

iyp/crawlers/ripe/roa.py

@@ -101,7 +101,7 @@ def run(self):
             self.iyp.batch_add_links('ROUTE_ORIGIN_AUTHORIZATION', links)
 
     def unit_test(self):
-        super().unit_test(['ROUTE_ORIGIN_AUTHORIZATION'])
+        return super().unit_test(['ROUTE_ORIGIN_AUTHORIZATION'])
 
 
 def main() -> None:

iyp/crawlers/simulamet/rirdata_rdns.py

@@ -124,7 +124,7 @@ def run(self):
         self.iyp.batch_add_links('MANAGED_BY', links_managed_by)
 
     def unit_test(self):
-        super().unit_test(['MANAGED_BY'])
+        return super().unit_test(['MANAGED_BY'])
 
 
 def main() -> None:

iyp/crawlers/stanford/asdb.py

@@ -127,7 +127,7 @@ def run(self):
         self.iyp.batch_add_links('CATEGORIZED', links)
 
     def unit_test(self):
-        super().unit_test(['CATEGORIZED'])
+        return super().unit_test(['CATEGORIZED'])
 
 
 def main() -> None:

iyp/crawlers/tranco/top1m.py

@@ -66,7 +66,7 @@ def run(self):
         self.iyp.batch_add_links('RANK', links)
 
     def unit_test(self):
-        super().unit_test(['RANK'])
+        return super().unit_test(['RANK'])
 
 
 def main() -> None:

iyp/crawlers/virginiatech/rovista.py

@@ -76,7 +76,7 @@ def run(self):
         self.iyp.batch_add_links('CATEGORIZED', links)
 
     def unit_test(self):
-        super().unit_test(['CATEGORIZED'])
+        return super().unit_test(['CATEGORIZED'])
 
 
 def main() -> None:

iyp/crawlers/worldbank/country_pop.py

@@ -65,7 +65,7 @@ def run(self):
         self.iyp.batch_add_links('POPULATION', links)
 
     def unit_test(self):
-        super().unit_test(['POPULATION'])
+        return super().unit_test(['POPULATION'])
 
 
 def main() -> None: