Merge branch 'master' of github.com:Toblerity/Fiona

tests/__init__.py

@@ -5,6 +5,6 @@
 For example:
 
     $ git grep 'from \.' | grep test
-    tests/test_layer.py:from .test_collection import ReadingTest
-    tests/test_vfs.py:from .test_collection import ReadingTest
+    tests/test_layer.py:from .test_collection import TestReading
+    tests/test_vfs.py:from .test_collection import TestReading
 """

tests/test_bytescollection.py

@@ -1,27 +1,24 @@
 """Tests for ``fiona.BytesCollection()``."""
 
 
-import unittest
-
 import pytest
 import six
 
 import fiona
 
-@pytest.mark.usefixtures('uttc_path_coutwildrnp_json')
-class ReadingTest(unittest.TestCase):
 
-    def setUp(self):
-        with open(self.path_coutwildrnp_json) as src:
+class TestReading(object):
+    @pytest.fixture(autouse=True)
+    def bytes_collection_object(self, path_coutwildrnp_json):
+        with open(path_coutwildrnp_json) as src:
             bytesbuf = src.read().encode('utf-8')
         self.c = fiona.BytesCollection(bytesbuf)
-
-    def tearDown(self):
+        yield
         self.c.close()
 
     @pytest.mark.skipif(six.PY2, reason='string are bytes in Python 2')
-    def test_construct_with_str(self):
-        with open(self.path_coutwildrnp_json) as src:
+    def test_construct_with_str(self, path_coutwildrnp_json):
+        with open(path_coutwildrnp_json) as src:
             strbuf = src.read()
         with pytest.raises(ValueError):
             fiona.BytesCollection(strbuf)
@@ -176,15 +173,13 @@ def test_in_keys(self):
         assert 0 in self.c
 
 
-@pytest.mark.usefixtures('uttc_path_coutwildrnp_json')
-class FilterReadingTest(unittest.TestCase):
-
-    def setUp(self):
-        with open(self.path_coutwildrnp_json) as src:
+class TestFilterReading(object):
+    @pytest.fixture(autouse=True)
+    def bytes_collection_object(self, path_coutwildrnp_json):
+        with open(path_coutwildrnp_json) as src:
             bytesbuf = src.read().encode('utf-8')
         self.c = fiona.BytesCollection(bytesbuf)
-
-    def tearDown(self):
+        yield
         self.c.close()
 
     def test_filter_1(self):