Merge branch 'sig_doc_coverage' of github.com:cmu-delphi/delphi-epidata into sig_doc_coverage

Author: nolangormley

integrations/acquisition/covidcast/test_coverage_crossref_update.py

@@ -39,31 +39,11 @@ def test_caching(self):
     """Populate, query, cache, query, and verify the cache."""
 
     # insert dummy data
-    self._db._cursor.execute('''
-      INSERT INTO `signal_dim` (`signal_key_id`, `source`, `signal`)
-      VALUES
-        (42, 'src', 'sig');
-    ''')
-    self._db._cursor.execute('''
-      INSERT INTO `geo_dim` (`geo_key_id`, `geo_type`, `geo_value`)
-      VALUES
-        (96, 'state', 'pa'),
-        (97, 'state', 'wa');
-    ''')
-    self._db._cursor.execute(f'''
-      INSERT INTO
-        `epimetric_latest` (`epimetric_id`, `signal_key_id`, `geo_key_id`, `time_type`,
-	      `time_value`, `value_updated_timestamp`,
-        `value`, `stderr`, `sample_size`,
-        `issue`, `lag`, `missing_value`,
-        `missing_stderr`,`missing_sample_size`)
-      VALUES
-        (15, 42, 96, 'day', 20200422,
-          123, 1, 2, 3, 20200422, 0, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),
-        (16, 42, 97, 'day', 20200422,
-          789, 1, 2, 3, 20200423, 1, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
-    ''')
-    self._db.commit()
+    self._insert_rows([
+        CovidcastTestRow.make_default_row(geo_type="state", geo_value="pa"),
+        CovidcastTestRow.make_default_row(geo_type="state", geo_value="ny"),
+        CovidcastTestRow.make_default_row(geo_type="state", geo_value="ny", signal="sig2"),
+    ])
 
     results = self._make_request()
 

src/maintenance/coverage_crossref_updater.py

@@ -1,14 +1,9 @@
 """Updates the table for the `coverage_crossref` endpoint."""
 
-# standard library
-import argparse
-import sys
 import time
 
-# first party
 from delphi.epidata.acquisition.covidcast.database import Database
 from delphi_utils import get_structured_logger
-from delphi.epidata.client.delphi_epidata import Epidata
 
 
 def main():
@@ -22,17 +17,11 @@ def main():
   # compute and update coverage_crossref
   try:
     coverage = database.compute_coverage_crossref()
-  except:
-    # clean up before failing
+  finally:
+    # clean up in success and in failure
     database.disconnect(True)
-    raise
-
-  result = ("success",1)
-  if coverage==0:
-    result = ("no results",-2)
-
-  logger.info('coverage_crossref result: %s (code %d)' % result)
 
+  logger.info(f"coverage_crossref returned: {coverage}")
 
   logger.info(
       "Generated and updated covidcast geo/signal coverage",