__nonzero__ should necessarily return a boolean value, so transform Mock

results into True.

2 files changed, 8 insertions, 1 deletions

diff --git a/mocker.py b/mocker.py
index ac6d1d5..a49675f 100644
--- a/mocker.py
+++ b/mocker.py
@@ -1092,9 +1092,12 @@ class Mock(object):
 
     def __nonzero__(self):
         try:
-            return self.__mocker_act__("nonzero")
+            result = self.__mocker_act__("nonzero")
         except MatchError, e:
             return True
+        if type(result) is Mock:
+            return True
+        return result
 
     def __iter__(self):
         # XXX On py3k, when next() becomes __next__(), we'll be able
diff --git a/test.py b/test.py
index 2647141..6816513 100755
--- a/test.py
+++ b/test.py
@@ -2543,6 +2543,10 @@ class MockTest(TestCase):
         self.mocker.act = raise_error
         self.assertEquals(bool(self.mock), True)
 
+    def test_nonzero_with_mock_result(self):
+        self.mocker.act = lambda path: Mock(self.mocker)
+        self.assertEquals(bool(self.mock), True)
+
     def test_iter(self):
         result_mock = Mock(self.mocker)
         self.mocker.act = lambda path: self.paths.append(path) or result_mock