From cb06a6b125d798b3d60ba105f2f86bbcd1a1357a Mon Sep 17 00:00:00 2001
From: Jeff Widman <jeff@jeffwidman.com>
Date: Wed, 11 Jan 2017 17:18:28 -0800
Subject: [PATCH] Update pytest fixtures to new yield syntax (#919)

---
 test/conftest.py     | 12 ++++--------
 test/test_metrics.py |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/conftest.py b/test/conftest.py
index 79ad074..e85b977 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -18,10 +18,8 @@ def version():
 def zookeeper(version, request):
     assert version
     zk = ZookeeperFixture.instance()
-    def fin():
-        zk.close()
-    request.addfinalizer(fin)
-    return zk
+    yield zk
+    zk.close()
 
 
 @pytest.fixture(scope="module")
@@ -29,10 +27,8 @@ def kafka_broker(version, zookeeper, request):
     assert version
     k = KafkaFixture.instance(0, zookeeper.host, zookeeper.port,
                               partitions=4)
-    def fin():
-        k.close()
-    request.addfinalizer(fin)
-    return k
+    yield k
+    k.close()
 
 
 @pytest.fixture
diff --git a/test/test_metrics.py b/test/test_metrics.py
index e4757d6..8d35f55 100644
--- a/test/test_metrics.py
+++ b/test/test_metrics.py
@@ -32,8 +32,8 @@ def reporter():
 @pytest.fixture
 def metrics(request, config, reporter):
     metrics = Metrics(config, [reporter], enable_expiration=True)
-    request.addfinalizer(lambda: metrics.close())
-    return metrics
+    yield metrics
+    metrics.close()
 
 
 def test_MetricName():