Commitc0566e0

and

authored

bpo-31177: Skip deleted attributes while calling reset_mock (GH-9302)

(cherry picked from commitedeca92)Co-authored-by: Xtreak <tirkarthi@users.noreply.github.com>

1 parent6c3f272 commitc0566e0Copy full SHA for c0566e0

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ def reset_mock(self, visited=None,*, return_value=False, side_effect=False):`
`543`	`543`	`self._mock_side_effect=None`
`544`	`544`
`545`	`545`	`forchildinself._mock_children.values():`
`546`		`-ifisinstance(child,_SpecState):`
	`546`	`+ifisinstance(child,_SpecState)orchildis_deleted:`
`547`	`547`	`continue`
`548`	`548`	`child.reset_mock(visited)`
`549`	`549`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1556,6 +1556,16 @@ def test_attribute_deletion(self):`
`1556`	`1556`	`self.assertRaises(AttributeError,getattr,mock,'f')`
`1557`	`1557`
`1558`	`1558`
	`1559`	`+deftest_reset_mock_does_not_raise_on_attr_deletion(self):`
	`1560`	`+# bpo-31177: reset_mock should not raise AttributeError when attributes`
	`1561`	`+# were deleted in a mock instance`
	`1562`	`+mock=Mock()`
	`1563`	`+mock.child=True`
	`1564`	`+delmock.child`
	`1565`	`+mock.reset_mock()`
	`1566`	`+self.assertFalse(hasattr(mock,'child'))`
	`1567`	`+`
	`1568`	`+`
`1559`	`1569`	`deftest_class_assignable(self):`
`1560`	`1570`	`formockinMock(),MagicMock():`
`1561`	`1571`	`self.assertNotIsInstance(mock,int)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix bug that prevented using:meth:`reset_mock <unittest.mock.Mock.reset_mock>`
	`2`	`+on mock instances with deleted attributes`

Comments

(0)