From 51dd63d3e182f2491acccc0e486f67a67b717003 Mon Sep 17 00:00:00 2001
From: Anatoly Bubenkov <bubenkoff@gmail.com>
Date: Wed, 14 Aug 2013 10:09:02 +0200
Subject: [PATCH 1/2] ignores

--HG--
branch : overriden-fixture-finalizer
---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgignore b/.hgignore
index 402cafa0b..2be7f81c9 100644
--- a/.hgignore
+++ b/.hgignore
@@ -32,3 +32,4 @@ env/
 .cache
 .coverage
 .ropeproject
+*.sublime-*

From 722b35b0a63ee7ea2655056378ede6ad159e0e3a Mon Sep 17 00:00:00 2001
From: Anatoly Bubenkov <bubenkoff@gmail.com>
Date: Wed, 14 Aug 2013 13:58:59 +0200
Subject: [PATCH 2/2] tests for fixture finalizers

--HG--
branch : overriden-fixture-finalizer
---
 testing/test_fixture_finalizer.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 testing/test_fixture_finalizer.py

diff --git a/testing/test_fixture_finalizer.py b/testing/test_fixture_finalizer.py
new file mode 100644
index 000000000..911647819
--- /dev/null
+++ b/testing/test_fixture_finalizer.py
@@ -0,0 +1,30 @@
+"""Tests for fixtures with different scoping."""
+import py.code
+
+
+def test_fixture_finalizer(testdir):
+    testdir.makeconftest("""
+    import pytest
+
+    @pytest.fixture
+    def browser(request):
+
+        def finalize():
+            print 'Finalized'
+        request.addfinalizer(finalize)
+        return {}
+    """)
+    b = testdir.mkdir("subdir")
+    b.join("test_overriden_fixture_finalizer.py").write(py.code.Source("""
+    import pytest
+    @pytest.fixture
+    def browser(browser):
+        browser['visited'] = True
+        return browser
+
+    def test_browser(browser):
+        assert browser['visited'] is True
+    """))
+    reprec = testdir.runpytest("-s")
+    for test in ['test_browser']:
+        reprec.stdout.fnmatch_lines('Finalized')