floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wrong merge 

--HG--
branch : nose_test_attr
This commit is contained in:
holger krekel 2014-04-10 12:58:10 +02:00
parent 5e26e6e553
commit e42cbc714f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/python/integration.py
View File

@ -164,7 +164,7 @@ class TestMockDecoration:
names = [x.nodeid.split("::")[-1] for x in calls] names = [x.nodeid.split("::")[-1] for x in calls]
assert names == ["test_one", "test_two", "test_three"] 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") pytest.importorskip("mock", "1.0.1")
testdir.makepyfile(""" testdir.makepyfile("""
from mock import patch from mock import patch
@ -172,7 +172,7 @@ class TestMockDecoration:
@patch('os.getcwd') @patch('os.getcwd')
@patch('os.path') @patch('os.path')
#@mark.slow @mark.slow
class TestSimple: class TestSimple:
def test_simple_thing(self, mock_path, mock_getcwd): def test_simple_thing(self, mock_path, mock_getcwd):
pass pass