Clean jobs before/after tests for some modules only

Author: vshlapakov

tests/hubstorage/conftest.py

@@ -41,6 +41,7 @@ def hsspiderid(hsproject):
 @pytest.fixture(autouse=True, scope='session')
 def setup_session(hsclient, hsproject, hscollection):
     set_testbotgroup(hsproject)
+    remove_all_jobs(hsproject)
     yield
     remove_all_jobs(hsproject)
     unset_testbotgroup(hsproject)
@@ -56,7 +57,6 @@ def setup_vcrpy_per_test(request, hsproject):
         request.function.__name__
     )
     #with my_vcr.use_cassette(cassette_name):
-    remove_all_jobs(hsproject)
     yield
 
 

tests/hubstorage/test_jobq.py

@@ -11,6 +11,14 @@
 
 from .conftest import TEST_PROJECT_ID, TEST_SPIDER_NAME
 from .conftest import hsspiderid
+from .conftest import remove_all_jobs
+
+
+@pytest.fixture(autouse=True)
+def clean_jobs(hsproject):
+    remove_all_jobs(hsproject)
+    yield
+    remove_all_jobs(hsproject)
 
 
 def _keys(lst):

tests/hubstorage/test_jobsmeta.py

@@ -3,8 +3,17 @@
 
 System tests for operations on stored job metadata
 """
+import pytest
 from .conftest import TEST_SPIDER_NAME
 from .conftest import start_job
+from .conftest import remove_all_jobs
+
+
+@pytest.fixture(autouse=True)
+def clean_jobs(hsproject):
+    remove_all_jobs(hsproject)
+    yield
+    remove_all_jobs(hsproject)
 
 
 def _assertMetadata(meta1, meta2):

tests/hubstorage/test_project.py

@@ -13,9 +13,17 @@
 from .conftest import hsspiderid
 from .conftest import start_job
 from .conftest import set_testbotgroup
+from .conftest import remove_all_jobs
 from .testutil import failing_downloader
 
 
+@pytest.fixture(autouse=True)
+def clean_jobs(hsproject):
+    remove_all_jobs(hsproject)
+    yield
+    remove_all_jobs(hsproject)
+
+
 def test_projectid(hsclient):
     p1 = hsclient.get_project(int(TEST_PROJECT_ID))
     p2 = hsclient.get_project(str(TEST_PROJECT_ID))

tests/hubstorage/test_system.py

@@ -10,10 +10,17 @@
 from .conftest import TEST_ENDPOINT, TEST_SPIDER_NAME
 from .conftest import TEST_PROJECT_ID, TEST_AUTH
 from .conftest import start_job
+from .conftest import remove_all_jobs
 
 
 MAGICN = 1211
 
+@pytest.fixture(autouse=True)
+def clean_jobs(hsproject):
+    remove_all_jobs(hsproject)
+    yield
+    remove_all_jobs(hsproject)
+
 
 @pytest.fixture
 def panelclient():