[Python-checkins] cpython (merge default -> default): Merge
michael.foord
python-checkins at python.org
Sat Nov 23 14:30:24 CET 2013
http://hg.python.org/cpython/rev/261429c07a4a
changeset: 87411:261429c07a4a
parent: 87410:d2e5b74e2d18
parent: 87409:c8c11082bd0c
user: Michael Foord <michael at voidspace.org.uk>
date: Sat Nov 23 13:30:03 2013 +0000
summary:
Merge
files:
Lib/unittest/test/testmock/testmock.py | 17 +------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -1302,20 +1302,6 @@
self.assertEqual(m.method_calls, [])
- def test_attribute_deletion(self):
- # this behaviour isn't *useful*, but at least it's now tested...
- for Klass in Mock, MagicMock, NonCallableMagicMock, NonCallableMock:
- m = Klass()
- original = m.foo
- m.foo = 3
- del m.foo
- self.assertEqual(m.foo, original)
-
- new = m.foo = Mock()
- del m.foo
- self.assertEqual(m.foo, new)
-
-
def test_mock_parents(self):
for Klass in Mock, MagicMock:
m = Klass()
@@ -1379,7 +1365,8 @@
def test_attribute_deletion(self):
- for mock in Mock(), MagicMock():
+ for mock in (Mock(), MagicMock(), NonCallableMagicMock(),
+ NonCallableMock()):
self.assertTrue(hasattr(mock, 'm'))
del mock.m
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list