Rework after code review

Author: Adrian Damian

astroquery/cadc/core.py

@@ -525,8 +525,7 @@ def get_data_urls(self, query_result, include_auxiliaries=False):
                                urlencode({'ID': pid_sublist,
                                           'REQUEST': 'downloads-only'}, True)))
             for service_def in datalink:
-                if service_def.semantics in \
-                        ['http://www.opencadc.org/caom2#pkg', '#package']:
+                if service_def.semantics in ['http://www.opencadc.org/caom2#pkg', '#package']:
                     # TODO http://www.openadc.org/caom2#pkg has been replaced
                     # by "package". Removed it after CADC rolls out the change
                     # package is an alternative for downloading multiple

astroquery/cadc/tests/test_cadctap_remote.py

@@ -206,7 +206,7 @@ def test_authsession(self):
 
     @pytest.mark.skipif(one_test, reason='One test mode')
     @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
-    @pytest.mark.skip('https://github.com/astropy/astroquery/issues/2325')
+    @pytest.mark.xfail(reason='#2325')
     def test_get_images(self):
         cadc = Cadc()
         coords = '08h45m07.5s +54d18m00s'
@@ -254,7 +254,7 @@ def test_get_images_against_AS(self):
 
     @pytest.mark.skipif(one_test, reason='One test mode')
     @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
-    @pytest.mark.skip('https://github.com/astropy/astroquery/issues/2325')
+    @pytest.mark.xfail(reason='#2325')
     def test_get_images_async(self):
         cadc = Cadc()
         coords = '01h45m07.5s +23d18m00s'
@@ -315,7 +315,7 @@ def test_list_tables(self):
                         reason='Requires real CADC certificate (CADC_CERT '
                                'environment variable)')
     @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
-    @pytest.mark.skip('https://github.com/astropy/astroquery/issues/2325')
+    @pytest.mark.xfail(reason='#2325')
     def test_list_jobs(self):
         cadc = Cadc()
         cadc.login(certificate_file=os.environ['CADC_CERT'])

setup.cfg

@@ -32,7 +32,7 @@ astropy_header = true
 text_file_format = rst
 xfail_strict = true
 remote_data_strict = true
-addopts = --doctest-rst
+#addopts = --doctest-rst
 filterwarnings =
     error
     ignore: Experimental:UserWarning: