@@ -59,10 +59,11 @@ def test_acquire_dataset(self):
5959 # acquire sample data into local database
6060 # mock out network calls to external hosts
6161 with self .subTest (name = 'first acquisition' ), \
62- patch .object (Network , 'fetch_metadata' , return_value = self .test_utils .load_sample_metadata ()) as mock_fetch_meta , \
63- patch .object (Network , 'fetch_dataset' , side_effect = [self .test_utils .load_sample_dataset ("dataset0.csv" ), # dataset for 3/13
64- self .test_utils .load_sample_dataset ("dataset0.csv" )] # dataset for 3/15
65- ) as mock_fetch :
62+ patch .object (Network , 'fetch_metadata' , return_value = self .test_utils .load_sample_metadata ()) as mock_fetch_meta , \
63+ patch .object (Network , 'fetch_dataset' , side_effect = [
64+ self .test_utils .load_sample_dataset ("dataset0.csv" ), # dataset for 3/13
65+ self .test_utils .load_sample_dataset ("dataset0.csv" ) # dataset for 3/15
66+ ]) as mock_fetch :
6667 acquired = Update .run ()
6768 self .assertTrue (acquired )
6869 self .assertEqual (mock_fetch_meta .call_count , 1 )
@@ -89,10 +90,11 @@ def test_acquire_dataset(self):
8990
9091 # re-acquisition of the same dataset should be a no-op
9192 with self .subTest (name = 'second acquisition' ), \
92- patch .object (Network , 'fetch_metadata' , return_value = self .test_utils .load_sample_metadata ()) as mock_fetch_meta , \
93- patch .object (Network , 'fetch_dataset' , side_effect = [self .test_utils .load_sample_dataset (), # late posted dataset for 3/15
94- self .test_utils .load_sample_dataset ("dataset1.csv" )] # dataset for 3/16
95- ) as mock_fetch :
93+ patch .object (Network , 'fetch_metadata' , return_value = self .test_utils .load_sample_metadata ()) as mock_fetch_meta , \
94+ patch .object (Network , 'fetch_dataset' , side_effect = [
95+ self .test_utils .load_sample_dataset ("dataset0.csv" ),
96+ self .test_utils .load_sample_dataset ("dataset0.csv" )
97+ ]) as mock_fetch :
9698 acquired = Update .run ()
9799 self .assertFalse (acquired )
98100
@@ -105,27 +107,29 @@ def test_acquire_dataset(self):
105107 # simulate issue posted after yesterday's run
106108 with self .subTest (name = 'late issue posted' ), \
107109 patch .object (Network , 'fetch_metadata' , return_value = self .test_utils .load_sample_metadata ("metadata2.csv" )) as mock_fetch_meta , \
108- patch .object (Network , 'fetch_dataset' , return_value = self .test_utils .load_sample_dataset ()) as mock_fetch :
110+ patch .object (Network , 'fetch_dataset' , return_value = self .test_utils .load_sample_dataset ("dataset1.csv" )) as mock_fetch :
109111 acquired = Update .run ()
110112 self .assertTrue (acquired )
111113 self .assertEqual (mock_fetch_meta .call_count , 1 )
112114
113115 # make sure everything was filed correctly
114116 with self .subTest (name = 'late issue data checks' ):
115117 response = Epidata .covid_hosp ('WY' , Epidata .range (20200101 , 20210101 ))
116- self .assertEqual (response ['result' ], 2 )
117- self .assertEqual (len (response ['epidata' ]), 1 )
118- row = response ['epidata' ][0 ] # data from 03-15, dataset.csv
118+ self .assertEqual (response ['result' ], 1 )
119+ self .assertEqual (len (response ['epidata' ]), 2 )
120+
121+ row = response ['epidata' ][0 ] # data from 03-15, dataset0.csv
119122 self .assertEqual (row ['state' ], 'WY' )
120123 self .assertEqual (row ['date' ], 20201209 )
121124 self .assertEqual (row ['issue' ], 20210315 ) # include today's data by default
122125 self .assertEqual (row ['critical_staffing_shortage_today_yes' ], 8 )
123126 self .assertEqual (row ['total_patients_hospitalized_confirmed_influenza_covid_coverage' ], 56 )
124127 self .assertIsNone (row ['critical_staffing_shortage_today_no' ])
128+
125129 row = response ['epidata' ][1 ] # data from 03-16, dataset1.csv
126130 self .assertEqual (row ['state' ], 'WY' )
127131 self .assertEqual (row ['date' ], 20201210 )
128- self .assertEqual (row ['issue' ], 20210315 ) # include today's data by default
132+ self .assertEqual (row ['issue' ], 20210316 ) # include today's data by default
129133 self .assertEqual (row ['critical_staffing_shortage_today_yes' ], 8 )
130134 self .assertEqual (row ['total_patients_hospitalized_confirmed_influenza_covid_coverage' ], 56 )
131135 self .assertIsNone (row ['critical_staffing_shortage_today_no' ])
0 commit comments