Replaced @yield_fixture with @fixture

@yield_fixture has been deprecated for a while.

3 files changed, 12 insertions, 12 deletions

diff --git a/tests/test_executors.py b/tests/test_executors.py
index 01bb185..16defd2 100644
--- a/tests/test_executors.py
+++ b/tests/test_executors.py
@@ -25,7 +25,7 @@ def mock_scheduler(timezone):
     return scheduler_
 
 
-@pytest.yield_fixture(params=['threadpool', 'processpool'])
+@pytest.fixture(params=['threadpool', 'processpool'])
 def executor(request, mock_scheduler):
     if request.param == 'threadpool':
         from apscheduler.executors.pool import ThreadPoolExecutor
diff --git a/tests/test_jobstores.py b/tests/test_jobstores.py
index de9bceb..f913f37 100644
--- a/tests/test_jobstores.py
+++ b/tests/test_jobstores.py
@@ -27,12 +27,12 @@ class DummyClass:
         return a + b
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def memjobstore():
     yield MemoryJobStore()
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def sqlalchemyjobstore(tmpdir):
     db_path = tmpdir.join('apscheduler_unittest.sqlite')
     sqlalchemy = pytest.importorskip('apscheduler.jobstores.sqlalchemy')
@@ -43,7 +43,7 @@ def sqlalchemyjobstore(tmpdir):
     db_path.remove()
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def rethinkdbjobstore():
     rethinkdb = pytest.importorskip('apscheduler.jobstores.rethinkdb')
     store = rethinkdb.RethinkDBJobStore(database='apscheduler_unittest')
@@ -53,7 +53,7 @@ def rethinkdbjobstore():
     store.shutdown()
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def mongodbjobstore():
     mongodb = pytest.importorskip('apscheduler.jobstores.mongodb')
     store = mongodb.MongoDBJobStore(database='apscheduler_unittest')
@@ -63,7 +63,7 @@ def mongodbjobstore():
     store.shutdown()
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def redisjobstore():
     redis = pytest.importorskip('apscheduler.jobstores.redis')
     store = redis.RedisJobStore()
@@ -73,7 +73,7 @@ def redisjobstore():
     store.shutdown()
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def zookeeperjobstore():
     zookeeper = pytest.importorskip('apscheduler.jobstores.zookeeper')
     store = zookeeper.ZooKeeperJobStore(path='/apscheduler_unittest')
diff --git a/tests/test_schedulers.py b/tests/test_schedulers.py
index b27a286..7bd2301 100644
--- a/tests/test_schedulers.py
+++ b/tests/test_schedulers.py
@@ -869,7 +869,7 @@ class SchedulerImplementationTestBase(object):
     def executor(self, scheduler):
         scheduler.add_executor(DebugExecutor())
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def start_scheduler(self, request, scheduler):
         yield scheduler.start
         if scheduler.running:
@@ -930,7 +930,7 @@ class TestBlockingScheduler(SchedulerImplementationTestBase):
         from apscheduler.schedulers.blocking import BlockingScheduler
         return BlockingScheduler()
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def start_scheduler(self, request, scheduler):
         thread = Thread(target=scheduler.start)
         yield thread.start
@@ -958,7 +958,7 @@ class TestAsyncIOScheduler(SchedulerImplementationTestBase):
         asyncio = pytest.importorskip('apscheduler.schedulers.asyncio')
         return asyncio.AsyncIOScheduler(event_loop=event_loop)
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def start_scheduler(self, request, event_loop, scheduler):
         event_loop.call_soon_threadsafe(scheduler.start)
         thread = Thread(target=event_loop.run_forever)
@@ -1000,7 +1000,7 @@ class TestTornadoScheduler(SchedulerImplementationTestBase):
         tornado = pytest.importorskip('apscheduler.schedulers.tornado')
         return tornado.TornadoScheduler(io_loop=io_loop)
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def start_scheduler(self, request, io_loop, scheduler):
         io_loop.add_callback(scheduler.start)
         thread = Thread(target=io_loop.start)
@@ -1023,7 +1023,7 @@ class TestTwistedScheduler(SchedulerImplementationTestBase):
         twisted = pytest.importorskip('apscheduler.schedulers.twisted')
         return twisted.TwistedScheduler(reactor=reactor)
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def start_scheduler(self, request, reactor, scheduler):
         reactor.callFromThread(scheduler.start)
         thread = Thread(target=reactor.run, args=(False,))