Merge pull request #2327 from bsipocz/alma_slow_test_cleanup

Cleanup test decorations

Author: bsipocz

astroquery/alma/tests/test_alma_remote.py

@@ -3,7 +3,7 @@
 import shutil
 import numpy as np
 import pytest
-import warnings
+
 from datetime import datetime
 import os
 from urllib.parse import urlparse
@@ -40,7 +40,7 @@ def alma(request):
     """
     alma = Alma()
     alma_site = request.config.getoption('--alma-site',
-                                         'almascience.org')
+                                         'almascience.eso.org')
     alma.archive_url = 'https://{}'.format(alma_site)
     return alma
 
@@ -85,9 +85,6 @@ def test_freq(self, alma):
             assert row['frequency'] <= 100
             assert '3' in row['band_list']
 
-    @pytest.mark.skipif("SKIP_SLOW",
-                        reason="Extremely slow due to limitations of "
-                               "the implementation")
     def test_bands(self, alma):
         payload = {'band_list': ['5', '7']}
         result = alma.query(payload)
@@ -116,14 +113,14 @@ def test_alma_source_name(self, alma):
         for row in result:
             assert 'GRB021004' == row['target_name']
 
-    @pytest.mark.skipif("SKIP_SLOW", reason="Known issue")
     def test_ra_dec(self, alma):
         payload = {'ra_dec': '181.0192d -0.01928d'}
         result = alma.query(payload)
         assert len(result) > 0
 
     @pytest.mark.skipif("SKIP_SLOW")
     def test_m83(self, temp_dir, alma):
+        # Runs for over 9 minutes
         alma.cache_location = temp_dir
 
         m83_data = alma.query_object('M83', science=True, legacy_columns=True)
@@ -205,6 +202,8 @@ def test_download_data(self, temp_dir, alma):
         assert len(results) == len(urls)
 
     def test_download_and_extract(self, temp_dir, alma):
+        # TODO: slowish, runs for ~90s
+
         alma.cache_location = temp_dir
         alma._cycle0_tarfile_content_table = {'ID': ''}
 
@@ -247,7 +246,6 @@ def test_download_and_extract(self, temp_dir, alma):
             'cache_path/' + asdm_url.split('/')[-1])
         assert downloaded_asdm == [os.path.join(temp_dir, 'foo.py')]
 
-    @pytest.mark.skipif("SKIP_SLOW", reason="Known issue")
     def test_doc_example(self, temp_dir, alma):
         alma.cache_location = temp_dir
         m83_data = alma.query_object('M83', legacy_columns=True)
@@ -304,7 +302,7 @@ def test_query(self, temp_dir, alma):
         #                     science=True)
         # assert len(result) == 1
 
-    @pytest.mark.skipif("SKIP_SLOW", reason="ra dec search known issue")
+    @pytest.mark.xfail(reason="ra dec search known issue")
     def test_misc(self, alma):
         # miscellaneous set of common tests
         #
@@ -367,7 +365,6 @@ def test_misc(self, alma):
             assert '6' == row['band_list']
             assert 'ginsburg' in row['obs_creator_name'].lower()
 
-    @pytest.mark.skipif("SKIP_SLOW")
     def test_user(self, alma):
         # miscellaneous set of tests from current users
         rslt = alma.query({'band_list': [6], 'project_code': '2012.1.*'},
@@ -380,7 +377,6 @@ def test_user(self, alma):
     # This has been reported, as it is definitely a bug.
     @pytest.mark.xfail
     @pytest.mark.bigdata
-    @pytest.mark.skipif("SKIP_SLOW")
     def test_cycle1(self, temp_dir, alma):
         # About 500 MB
         alma.cache_location = temp_dir
@@ -427,7 +423,7 @@ def test_cycle1(self, temp_dir, alma):
         assert len(data) == 6
 
     @pytest.mark.skipif("SKIP_SLOW")
-    @pytest.mark.skip("Not working anymore")
+    @pytest.mark.xfail(reason="Not working anymore")
     def test_cycle0(self, temp_dir, alma):
         # About 20 MB
         alma.cache_location = temp_dir

astroquery/conftest.py

@@ -53,7 +53,7 @@ def pytest_addoption(parser):
     parser.addoption(
         '--alma-site',
         action='store',
-        default='almascience.org',
+        default='almascience.eso.org',
         help='ALMA site (almascience.nrao.edu, almascience.eso.org or '
              'almascience.nao.ac.jp for example)'
     )