diff options
| author | Michael Foord <michael@voidspace.org.uk> | 2012-01-03 17:27:44 +0000 |
|---|---|---|
| committer | Michael Foord <michael@voidspace.org.uk> | 2012-01-03 17:27:44 +0000 |
| commit | eb4fbe744566c5d310956412c4a7423474434c82 (patch) | |
| tree | c9b9cd615658d511f796a11683b720d996ccfcfc | |
| parent | 05a37eea386eb1b01274c2efb3dec92fe0022653 (diff) | |
| download | mock-eb4fbe744566c5d310956412c4a7423474434c82.tar.gz | |
Removing one expectedFailure and adding one
| -rw-r--r-- | tests/testhelpers.py | 1 | ||||
| -rw-r--r-- | tests/testmock.py | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/testhelpers.py b/tests/testhelpers.py index 5113e41..345d648 100644 --- a/tests/testhelpers.py +++ b/tests/testhelpers.py @@ -319,6 +319,7 @@ class SpecSignatureTest(unittest2.TestCase): @unittest2.expectedFailure def test_create_autospec_unbound_methods(self): + # see issue 128 class Foo(object): def foo(self): pass diff --git a/tests/testmock.py b/tests/testmock.py index 675a01d..d750756 100644 --- a/tests/testmock.py +++ b/tests/testmock.py @@ -1186,7 +1186,6 @@ class MockTest(unittest2.TestCase): self.assertEqual(mock.mock_calls, [call(), call()()]) - @unittest2.expectedFailure def test_manager_mock(self): class Foo(object): one = 'one' @@ -1200,8 +1199,8 @@ class MockTest(unittest2.TestCase): mock_two = p2.start() self.addCleanup(p2.stop) - manager.one = mock_one - manager.two = mock_two + manager.attach_mock(mock_one, 'one') + manager.attach_mock(mock_two, 'two') Foo.two() Foo.one() |