Mock next/__next__

sebastinas · sebastinas · commit 5d59275c8185 · 2015-02-05T13:24:43.000+01:00
It is not enough to add them to a MagicMock object, since the lookup is magic
methods is special.

Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/test/__init__.py b/bpython/test/__init__.py
@@ -1,12 +1,25 @@
+# -*- coding: utf-8 -*-
+
 try:
     import unittest2 as unittest
 except ImportError:
     import unittest
 
+from mock import MagicMock, Mock
+
 from bpython.translations import init
+from bpython._py3compat import py3
 
 class FixLanguageTestCase(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
         init(languages=['en'])
+
+
+class MagicIterMock(MagicMock):
+
+    if py3:
+        __next__ = Mock(return_value=None)
+    else:
+        next = Mock(return_value=None)
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -6,7 +6,7 @@
 import sys
 import tempfile
 from contextlib import contextmanager
-from mock import Mock, patch, MagicMock
+from mock import Mock, patch
 from six.moves import StringIO
 
 try:
@@ -20,7 +20,8 @@
 from bpython import config
 from bpython import args
 from bpython._py3compat import py3
-from bpython.test import FixLanguageTestCase as TestCase
+from bpython.test import FixLanguageTestCase as TestCase, MagicIterMock
+
 
 def setup_config(conf):
     config_struct = config.Struct()
@@ -86,6 +87,7 @@ def test_get_last_word_with_prev_line(self):
         self.repl.up_one_line()
         self.assertEqual(self.repl.current_line,'2 3')
 
+
 def mock_next(obj, return_value):
     if py3:
         obj.__next__.return_value = return_value
@@ -96,7 +98,7 @@ class TestCurtsiesReplTab(TestCase):
 
     def setUp(self):
         self.repl = create_repl()
-        self.repl.matches_iter = MagicMock()
+        self.repl.matches_iter = MagicIterMock()
         def add_matches(*args, **kwargs):
             self.repl.matches_iter.matches = ['aaa', 'aab', 'aac']
         self.repl.complete = Mock(side_effect=add_matches,
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -3,7 +3,7 @@
 import os
 import socket
 
-from mock import Mock, MagicMock
+from mock import Mock
 
 try:
     import unittest2 as unittest
@@ -12,6 +12,7 @@
 
 from bpython._py3compat import py3
 from bpython import config, repl, cli, autocomplete
+from bpython.test import MagicIterMock
 
 
 def setup_config(conf):
@@ -373,7 +374,7 @@ def setUp(self):
 
     # 3 Types of tab complete
     def test_simple_tab_complete(self):
-        self.repl.matches_iter = MagicMock()
+        self.repl.matches_iter = MagicIterMock()
         if py3:
             self.repl.matches_iter.__bool__.return_value = False
         else:
