From e42cbc714f237ccfcf796b535e905cfdb7299d98 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Thu, 10 Apr 2014 12:58:10 +0200 Subject: [PATCH] fix wrong merge --HG-- branch : nose_test_attr --- testing/python/integration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/python/integration.py b/testing/python/integration.py index f8feb865c..e5764df9c 100644 --- a/testing/python/integration.py +++ b/testing/python/integration.py @@ -164,7 +164,7 @@ class TestMockDecoration: names = [x.nodeid.split("::")[-1] for x in calls] assert names == ["test_one", "test_two", "test_three"] - def test_mock_and_mark_issue473(self, testdir): + def test_mock_double_patch_issue473(self, testdir): pytest.importorskip("mock", "1.0.1") testdir.makepyfile(""" from mock import patch @@ -172,7 +172,7 @@ class TestMockDecoration: @patch('os.getcwd') @patch('os.path') - #@mark.slow + @mark.slow class TestSimple: def test_simple_thing(self, mock_path, mock_getcwd): pass