test first, then fix

Author: krivard

src/acquisition/covidcast/csv_importer.py

@@ -92,7 +92,7 @@ def find_issue_specific_csv_files(scan_dir, glob=glob):
         issue_date_value = int(issuedir_match.group(2))
         issue_date = CsvImporter.is_sane_day(issue_date_value)
         if issue_date:
-          logger.info(event='processing csv files from issue', detail=issue_date, file=path)
+          logger.info(event='processing csv files from issue', detail=issue_date, path)
           yield from CsvImporter.find_csv_files(path, issue=(issue_date, epi.Week.fromdate(issue_date)), glob=glob)
         else:
           logger.warning(event='invalid issue directory day', detail=issue_date_value, file=path)

tests/acquisition/covidcast/test_csv_importer.py

@@ -47,21 +47,19 @@ def test_find_issue_specific_csv_files(self):
 
       path_prefix='prefix/to/the/data/'
       #valid day path
-      glob_paths = [path_prefix +'/archive/failed/src-name/issue_20200408']
-      issue_path='/archive/failed/src-name/issue_20200408'
+      issue_path='issue_20200408'
+      glob_issue_path = path_prefix + issue_path
+      glob_file_path = path_prefix + issue_path + '/valid/20200408_nation_sig.csv'
       mock_glob = MagicMock()
-      mock_glob.glob.return_value = glob_paths
-      issuedir_match = CsvImporter.PATTERN_ISSUE_DIR.match(issue_path.lower())
+      mock_glob.glob.side_effect = ([glob_issue_path], [glob_file_path])
+      issuedir_match = CsvImporter.PATTERN_ISSUE_DIR.match(glob_issue_path.lower())
       issue_date_value = int(issuedir_match.group(2))
 
       #check if the day is a valid issue day.
       self.assertTrue(CsvImporter.is_sane_day(issue_date_value))
 
-      with self.assertRaises(Exception):
-        CsvImporter.find_issue_specific_csv_files(path_prefix, glob=mock_glob)
-
-      
- 
+      found = set(CsvImporter.find_issue_specific_csv_files(path_prefix, glob=mock_glob))
+      self.assertTrue(len(found)>0)
 
   def test_find_csv_files(self):
     """Recursively explore and find CSV files."""
@@ -327,4 +325,4 @@ def test_load_csv_with_valid_header(self):
     self.assertEqual(rows[2].missing_stderr, Nans.NOT_MISSING)
     self.assertEqual(rows[2].missing_sample_size, Nans.REGION_EXCEPTION)
 
-    self.assertIsNone(rows[3])
+    self.assertIsNone(rows[3])