Fixed alma integration tests

Author: Adrian Damian

astroquery/alma/__init__.py

@@ -11,8 +11,6 @@
              'https://almascience.nrao.edu',
              'https://almascience.nao.ac.jp']
 
-_test_url_list = ['https://beta.cadc-ccda.hia-ha.nrc-cnrc.gc.ca']
-
 auth_urls = ['asa.alma.cl', 'rh-cas.alma.cl']
 
 
@@ -27,11 +25,6 @@ class Conf(_config.ConfigNamespace):
         _url_list,
         'The ALMA Archive mirror to use.')
 
-    test_archive_url = _config.ConfigItem(
-        _test_url_list,
-        'ALMA Archive Test Mirrors (temporary)'
-    )
-
     auth_url = _config.ConfigItem(
         auth_urls,
         'ALMA Central Authentication Service URLs'

astroquery/alma/core.py

@@ -677,7 +677,7 @@ def _HEADER_data_size(self, files):
         return data_sizes, totalsize.to(u.GB)
 
     def download_files(self, files, savedir=None, cache=True,
-                       continuation=True, skip_unauthorized=True):
+                       continuation=True, skip_unauthorized=True,):
         """
         Given a list of file URLs, download them
 
@@ -711,8 +711,7 @@ def download_files(self, files, savedir=None, cache=True,
         for fileLink in unique(files):
             log.debug("Downloading {0} to {1}".format(fileLink, savedir))
             try:
-                check_filename = self._request('HEAD', fileLink, auth=auth,
-                                               stream=True)
+                check_filename = self._request('HEAD', fileLink, auth=auth)
                 check_filename.raise_for_status()
             except requests.HTTPError as ex:
                 if ex.response.status_code == 401:
@@ -748,7 +747,7 @@ def download_files(self, files, savedir=None, cache=True,
                                     auth=auth,
                                     cache=cache,
                                     method='GET',
-                                    head_safe=True,
+                                    head_safe=False,
                                     continuation=continuation)
 
                 downloaded_files.append(filename)
@@ -777,7 +776,7 @@ def download_files(self, files, savedir=None, cache=True,
                                         auth=auth,
                                         cache=cache,
                                         method='GET',
-                                        head_safe=True,
+                                        head_safe=False,
                                         continuation=continuation)
 
                     downloaded_files.append(filename)
@@ -1107,7 +1106,7 @@ def download_and_extract_files(self, urls, delete=True, regex=r'.*\.fits$',
                 expanded_files += [x for x in files['access_url'] if
                                    filere.match(x.split('/')[-1])]
             else:
-                tar_files.append(tar_file)
+                tar_files.append(url)
 
         try:
             # get the tar files