test code fixed to use 'r' instead of 'rb'

new local cycle0 test with "new style" ALMA querying

Author: adamginsburg

astroquery/alma/tests/test_alma.py

@@ -29,6 +29,8 @@ def data_path(filename):
                       'downloadRequest786572566script.sh',
                       'http://almascience.eso.org/rh/requests/anonymous/786978956/script':
                       'downloadRequest786978956script.sh',
+                      'http://almascience.eso.org/rh/requests/anonymous/787632764/script':
+                      'downloadRequest787632764script.sh',
                      },
               'POST': {'http://almascience.eso.org/rh/submission':
                        'initial_response.html'}
@@ -129,7 +131,7 @@ def test_parse_staging_request_page_asdm(monkeypatch):
     alma.dataarchive_url = _get_dataarchive_url()
     monkeypatch.setattr(alma, '_request', alma_request)
 
-    with open(data_path('request_786572566.html'), 'rb') as f:
+    with open(data_path('request_786572566.html'), 'r') as f:
         response = MockResponse(content=f.read())
 
     alma._staging_log = {'data_list_url': 'request_786572566.html'}
@@ -144,7 +146,7 @@ def test_parse_staging_request_page_mous(monkeypatch):
     alma.dataarchive_url = _get_dataarchive_url()
     monkeypatch.setattr(alma, '_request', alma_request)
 
-    with open(data_path('request_786978956.html'), 'rb') as f:
+    with open(data_path('request_786978956.html'), 'r') as f:
         response = MockResponse(content=f.read())
 
     alma._staging_log = {'data_list_url': 'request_786978956.html'}
@@ -153,3 +155,19 @@ def test_parse_staging_request_page_mous(monkeypatch):
     assert tbl[0]['uid'] == 'uid://A002/X3216af/X31'
     np.testing.assert_approx_equal(tbl[0]['size'], 0.2093)
     assert len(tbl) == 26
+
+def test_parse_staging_request_page_mous_cycle0(monkeypatch):
+    monkeypatch.setattr(Alma, '_get_dataarchive_url', _get_dataarchive_url)
+    alma = Alma()
+    alma.dataarchive_url = _get_dataarchive_url()
+    monkeypatch.setattr(alma, '_request', alma_request)
+
+    with open(data_path('request_787632764.html'), 'r') as f:
+        response = MockResponse(content=f.read())
+
+    alma._staging_log = {'data_list_url': 'request_787632764.html'}
+    tbl = alma._parse_staging_request_page(response)
+    assert tbl[0]['URL'] == 'https://almascience.eso.org/dataPortal/requests/anonymous/787632764/ALMA/2011.0.00121.S_2012-08-16_001_of_002.tar/2011.0.00121.S_2012-08-16_001_of_002.tar'
+    assert tbl[0]['uid'] == 'uid://A002/X327408/X246'
+    np.testing.assert_approx_equal(tbl[0]['size'], 5.9)
+    assert len(tbl) == 32

astroquery/alma/tests/test_alma_remote.py

@@ -132,13 +132,20 @@ def test_cycle0(self, temp_dir):
         result = alma.query(payload=payload)
         assert len(result) == 1
 
-        uid_url_table = alma.stage_data(result['Asdm_uid'])
-        assert len(uid_url_table) == 2
+        uid_url_table_mous = alma().stage_data(result['Member_ous_id'])
+        uid_url_table_asdm = alma().stage_data(result['Asdm_uid'])
+        assert len(uid_url_table_asdm) == 1
+        assert len(uid_url_table_mous) == 32
+
+        assert uid_url_table_mous[0]['URL'] == 'https://almascience.eso.org/dataPortal/requests/anonymous/787632764/ALMA/2011.0.00121.S_2012-08-16_001_of_002.tar/2011.0.00121.S_2012-08-16_001_of_002.tar'
+        assert uid_url_table_mous[0]['uid'] == 'uid://A002/X327408/X246'
 
-        # The sizes are 4.9 and 0.016 GB respectively
-        data = alma.download_and_extract_files(uid_url_table['URL'][1:])
+        small = uid_url_table_mous['size'] < 1
+
+        urls_to_download = uid_url_table_mous[small]['URL']
+        data = alma.download_and_extract_files(urls_to_download)
 
-        assert len(data) == 2
+        assert len(data) == 10
 
     def test_help(self):