From 1ff64697679213ec031d046a2da281a95cb9a43d Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Fri, 28 Mar 2014 21:42:07 +0100
Subject: [PATCH] Remove ugly fixture, at least make it local

---
 tests/storage/conftest.py        | 6 ------
 tests/storage/test_filesystem.py | 5 ++++-
 2 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 tests/storage/conftest.py

diff --git a/tests/storage/conftest.py b/tests/storage/conftest.py
deleted file mode 100644
index 9a07d98..0000000
--- a/tests/storage/conftest.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import pytest
-
-
-@pytest.fixture
-def class_tmpdir(request, tmpdir):
-    request.instance.tmpdir = str(tmpdir)
diff --git a/tests/storage/test_filesystem.py b/tests/storage/test_filesystem.py
index d040145..d7506bd 100644
--- a/tests/storage/test_filesystem.py
+++ b/tests/storage/test_filesystem.py
@@ -14,10 +14,13 @@ from vdirsyncer.storage.filesystem import FilesystemStorage
 from . import StorageTests
 
 
-@pytest.mark.usefixtures('class_tmpdir')
 class TestFilesystemStorage(StorageTests):
     storage_class = FilesystemStorage
 
+    @pytest.fixture(autouse=True)
+    def setup(self, tmpdir):
+        self.tmpdir = str(tmpdir)
+
     def get_storage_args(self, collection=None):
         path = self.tmpdir
         if collection is not None: