Merge 9105cd4 into ef15d30

astropy · Aug 2, 2018 · fe06a51 · fe06a51
2 parents ef15d30 + 9105cd4
commit fe06a51
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/pyvo/dal/tests/test_tap.py b/pyvo/dal/tests/test_tap.py
@@ -47,7 +47,7 @@ def _test_image_results(results):
 
 
 @pytest.fixture()
-def sync(mocker):
+def sync_fixture(mocker):
     def callback(request, context):
         return get_pkg_data_contents('data/tap/obscore-image.xml')
 
@@ -58,7 +58,7 @@ def callback(request, context):
 
 
 @pytest.fixture()
-def async(mocker):
+def async_fixture(mocker):
     class Callback(object):
         def __init__(self):
             self._jobs = dict()
@@ -244,7 +244,7 @@ def test_escape():
             "SELECT * FROM ivoa.obscore WHERE dataproduct_type = ''image''")
 
 
-@pytest.mark.usefixtures('sync')
+@pytest.mark.usefixtures('sync_fixture')
 @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W27")
 @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W48")
 @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W06")
@@ -303,7 +303,7 @@ def test_upload_methods(self):
         assert upload_methods[3].ivo_id == (
             'ivo://ivoa.net/std/TAPRegExt#upload-http')
 
-    @pytest.mark.usefixtures('sync')
+    @pytest.mark.usefixtures('sync_fixture')
     @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W27")
     @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W48")
     @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W06")
@@ -312,7 +312,7 @@ def test_run_sync(self):
         results = service.run_sync("SELECT * FROM ivoa.obscore")
         _test_image_results(results)
 
-    @pytest.mark.usefixtures('sync')
+    @pytest.mark.usefixtures('sync_fixture')
     @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W27")
     @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W48")
     @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W06")
@@ -321,7 +321,7 @@ def test_search(self):
         results = service.search("SELECT * FROM ivoa.obscore")
         _test_image_results(results)
 
-    @pytest.mark.usefixtures('async')
+    @pytest.mark.usefixtures('async_fixture')
     @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W27")
     @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W48")
     @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W06")
@@ -330,7 +330,7 @@ def test_run_async(self):
         results = service.run_async("SELECT * FROM ivoa.obscore")
         _test_image_results(results)
 
-    @pytest.mark.usefixtures('async')
+    @pytest.mark.usefixtures('async_fixture')
     def test_submit_job(self):
         service = TAPService('http://example.com/tap')
         job = service.submit_job(
@@ -346,7 +346,7 @@ def test_submit_job(self):
         job.wait()
         job.delete()
 
-    @pytest.mark.usefixtures('async')
+    @pytest.mark.usefixtures('async_fixture')
     def test_modify_job(self):
         service = TAPService('http://example.com/tap')
         job = service.submit_job(