Merge pull request #790 from keflavich/alma_test_updates

Continued fixes to ALMA remote tests

Author: keflavich

astroquery/alma/core.py

@@ -240,10 +240,10 @@ def stage_data(self, uids):
         log.debug("First response URL: {0}".format(response.url))
         if response.status_code == 405:
             if hasattr(self,'_last_successful_staging_log'):
-                log.warn("Error 405 received.  If you have previously staged "
-                         "the same UIDs, the result returned is probably "
-                         "correct, otherwise you may need to create a fresh "
-                         "astroquery.Alma instance.")
+                log.warning("Error 405 received.  If you have previously staged "
+                            "the same UIDs, the result returned is probably "
+                            "correct, otherwise you may need to create a fresh "
+                            "astroquery.Alma instance.")
                 return self._last_successful_staging_log['result']
             else:
                 raise HTTPError("Received an error 405: this may indicate you "

astroquery/alma/tests/test_alma_remote.py

@@ -11,13 +11,13 @@
 
 from .. import Alma
 
-all_colnames = ['Project code', 'Source name', 'RA', 'Dec', 'Band',
+all_colnames = {'Project code', 'Source name', 'RA', 'Dec', 'Band',
                 'Frequency resolution', 'Integration', 'Release date',
                 'Frequency support', 'Velocity resolution', 'Pol products',
                 'Observation date', 'PI name', 'PWV', 'Member ous id',
                 'Asdm uid', 'Project title', 'Project type', 'Scan intent',
-                'Spatial resolution', 'Largest angular scale', 'QA0 Status',
-                'QA2 Status', 'Project abstract']
+                'Spatial resolution', 'Largest angular scale',
+                'QA2 Status', 'Group ous id', 'Pub'}
 
 
 @remote_data
@@ -59,7 +59,7 @@ def test_SgrAstar(self, temp_dir):
         result_c = alma.query_region(c, 1 * u.deg)
         assert b'2011.0.00217.S' in result_c['Project code']
 
-    def test_m83(self, temp_dir):
+    def test_m83(self, temp_dir, recwarn):
         alma = Alma()
         alma.cache_location = temp_dir
 
@@ -72,14 +72,21 @@ def test_m83(self, temp_dir):
         assert len(link_list) >= 47
 
         # test re-staging
-        with pytest.raises(requests.HTTPError) as ex:
-            link_list = alma.stage_data(uids)
-        assert ex.value.args[0] == ('Received an error 405: this may indicate you have '
-                                    'already staged the data.  Try downloading the '
-                                    'file URLs directly with download_files.')
-
-
-    def test_stage_data(self, temp_dir):
+        # (has been replaced with warning)
+        #with pytest.raises(requests.HTTPError) as ex:
+        #    link_list = alma.stage_data(uids)
+        #assert ex.value.args[0] == ('Received an error 405: this may indicate you have '
+        #                            'already staged the data.  Try downloading the '
+        #                            'file URLs directly with download_files.')
+
+        # log.warning doesn't actually make a warning
+        #link_list = alma.stage_data(uids)
+        #w = recwarn.pop()
+        #assert (str(w.message) == ('Error 405 received.  If you have previously staged the '
+        #                           'same UIDs, the result returned is probably correct,'
+        #                           ' otherwise you may need to create a fresh astroquery.Alma instance.'))
+
+    def test_stage_data(self, temp_dir, recwarn):
         alma = Alma()
         alma.cache_location = temp_dir
 
@@ -100,11 +107,18 @@ def test_stage_data(self, temp_dir):
                 os.path.split(result['URL'][0])[1])
 
         # test re-staging
-        with pytest.raises(requests.HTTPError) as ex:
-            result = alma.stage_data([uid])
-        assert ex.value.args[0] == ('Received an error 405: this may indicate you have '
-                                    'already staged the data.  Try downloading the '
-                                    'file URLs directly with download_files.')
+        #with pytest.raises(requests.HTTPError) as ex:
+        #    result = alma.stage_data([uid])
+        #assert ex.value.args[0] == ('Received an error 405: this may indicate you have '
+        #                            'already staged the data.  Try downloading the '
+        #                            'file URLs directly with download_files.')
+
+        # log.warning doesn't actually make a warning
+        #result = alma.stage_data([uid])
+        #w = recwarn.pop()
+        #assert (str(w.message) == ('Error 405 received.  If you have previously staged the '
+        #                           'same UIDs, the result returned is probably correct,'
+        #                           ' otherwise you may need to create a fresh astroquery.Alma instance.'))
 
 
     def test_doc_example(self, temp_dir):
@@ -172,7 +186,7 @@ def test_cycle1(self, temp_dir):
         # A 2-row table may not be OK any more, but that's what it used to
         # be...
         assert len(uid_url_table_asdm) == 1
-        assert len(uid_url_table_mous) == 2
+        assert len(uid_url_table_mous) >= 2 # now is len=3 (Nov 17, 2016)
 
         # URL should look like:
         # https://almascience.eso.org/dataPortal/requests/anonymous/944120962/ALMA/2012.1.00912.S_uid___A002_X5a9a13_X528_001_of_001.tar/2012.1.00912.S_uid___A002_X5a9a13_X528_001_of_001.tar

astroquery/alma/tests/test_alma_utils.py

@@ -70,7 +70,12 @@ def test_make_finder_chart():
                                      'Eta Carinae')
     image, catalog, hit_mask_public, hit_mask_private = result
 
-    assert len(catalog) >= 7
-    assert 3 in hit_mask_public
+    assert len(catalog) >= 6 # down to 6 on Nov 17, 2016
+    assert 3 in [int(x) for x in hit_mask_public]
     # Feb 8 2016: apparently the 60s integration hasn't actually been released yet...
-    assert hit_mask_public[3][256,256] >= 30.23
+    if 3 in hit_mask_public:
+        assert hit_mask_public[3][256,256] >= 30.23
+    elif b'3' in hit_mask_public:
+        assert hit_mask_public[b'3'][256,256] >= 30.23
+    else:
+        raise ValueError("hit_mask keys are not of any known type")

astroquery/alma/utils.py

@@ -441,13 +441,13 @@ def make_finder_chart_from_image_and_catalog(image, catalog, save_prefix,
             fig.show_contour(fits.PrimaryHDU(data=hit_mask_public[band],
                                              header=image.header),
                              levels=integration_time_contour_levels,
-                             colors=[band_colors_pub[band]] * len(integration_time_contour_levels),
+                             colors=[band_colors_pub[int(band)]] * len(integration_time_contour_levels),
                              convention='calabretta')
         if band in hit_mask_private:
             fig.show_contour(fits.PrimaryHDU(data=hit_mask_private[band],
                                              header=image.header),
                              levels=integration_time_contour_levels,
-                             colors=[band_colors_priv[band]] * len(integration_time_contour_levels),
+                             colors=[band_colors_priv[int(band)]] * len(integration_time_contour_levels),
                              convention='calabretta')
 
     fig.save('{0}_almafinderchart.png'.format(save_prefix))