Use unittest.mock if possible

sebastinas · sebastinas · commit 758d6a6b0a79 · 2015-02-06T23:06:38.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/.travis.install.sh b/.travis.install.sh
@@ -17,10 +17,12 @@ if [[ $RUN == nosetests ]]; then
     if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then
       pip install unittest2
     fi
-    # dependencies for crasher tests
     case $TRAVIS_PYTHON_VERSION in
       2*)
+        # dependencies for crasher tests
         pip install Twisted urwid
+        # test specific dependencies
+        pip install mock
         ;;
     esac
     # build and install
diff --git a/bpython/test/__init__.py b/bpython/test/__init__.py
@@ -5,7 +5,10 @@
 except ImportError:
     import unittest
 
-from mock import MagicMock, Mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from bpython.translations import init
 from bpython._py3compat import py3
@@ -18,9 +21,9 @@ def setUpClass(cls):
         init(languages=['en'])
 
 
-class MagicIterMock(MagicMock):
+class MagicIterMock(mock.MagicMock):
 
     if py3:
-        __next__ = Mock(return_value=None)
+        __next__ = mock.Mock(return_value=None)
     else:
-        next = Mock(return_value=None)
+        next = mock.Mock(return_value=None)
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -1,7 +1,5 @@
 from collections import namedtuple
-from bpython import autocomplete
 
-import mock
 try:
     import unittest2 as unittest
 except ImportError:
@@ -13,6 +11,9 @@
 except ImportError:
     has_jedi = False
 
+from bpython import autocomplete
+from bpython.test import mock
+
 
 class TestSafeEval(unittest.TestCase):
     def test_catches_syntax_error(self):
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -6,7 +6,6 @@
 import sys
 import tempfile
 from contextlib import contextmanager
-from mock import Mock, patch
 from six.moves import StringIO
 
 try:
@@ -20,7 +19,7 @@
 from bpython import config
 from bpython import args
 from bpython._py3compat import py3
-from bpython.test import FixLanguageTestCase as TestCase, MagicIterMock
+from bpython.test import FixLanguageTestCase as TestCase, MagicIterMock, mock
 
 
 def setup_config(conf):
@@ -106,8 +105,8 @@ def setUp(self):
         def add_matches(*args, **kwargs):
             self.repl.matches_iter.matches = ['aaa', 'aab', 'aac']
 
-        self.repl.complete = Mock(side_effect=add_matches,
-                                  return_value=True)
+        self.repl.complete = mock.Mock(side_effect=add_matches,
+                                       return_value=True)
 
     def test_tab_with_no_matches_triggers_completion(self):
         self.repl._current_line = ' asdf'
@@ -171,9 +170,9 @@ def setUp(self):
     def test_list_win_visible_match_selected_on_tab_multiple_options(self):
         self.repl._current_line = " './'"
         self.repl._cursor_offset = 2
-        with patch('bpython.autocomplete.get_completer_bpython') as mock:
-            mock.return_value = (['./abc', './abcd', './bcd'],
-                                 autocomplete.FilenameCompletion())
+        with mock.patch('bpython.autocomplete.get_completer_bpython') as m:
+            m.return_value = (['./abc', './abcd', './bcd'],
+                              autocomplete.FilenameCompletion())
             self.repl.update_completion()
             self.assertEqual(self.repl.list_win_visible, False)
             self.repl.on_tab()
@@ -183,9 +182,9 @@ def test_list_win_visible_match_selected_on_tab_multiple_options(self):
     def test_list_win_not_visible_and_cseq_if_cseq(self):
         self.repl._current_line = " './a'"
         self.repl._cursor_offset = 5
-        with patch('bpython.autocomplete.get_completer_bpython') as mock:
-            mock.return_value = (['./abcd', './abce'],
-                                 autocomplete.FilenameCompletion())
+        with mock.patch('bpython.autocomplete.get_completer_bpython') as m:
+            m.return_value = (['./abcd', './abce'],
+                              autocomplete.FilenameCompletion())
             self.repl.update_completion()
             self.assertEqual(self.repl.list_win_visible, False)
         self.repl.on_tab()
@@ -196,8 +195,8 @@ def test_list_win_not_visible_and_cseq_if_cseq(self):
     def test_list_win_not_visible_and_match_selected_if_one_option(self):
         self.repl._current_line = " './a'"
         self.repl._cursor_offset = 5
-        with patch('bpython.autocomplete.get_completer_bpython') as mock:
-            mock.return_value = (['./abcd'], autocomplete.FilenameCompletion())
+        with mock.patch('bpython.autocomplete.get_completer_bpython') as m:
+            m.return_value = (['./abcd'], autocomplete.FilenameCompletion())
             self.repl.update_completion()
             self.assertEqual(self.repl.list_win_visible, False)
         self.repl.on_tab()
diff --git a/bpython/test/test_filewatch.py b/bpython/test/test_filewatch.py
@@ -1,4 +1,3 @@
-import mock
 import os
 
 try:
@@ -13,6 +12,7 @@
 except ImportError:
     has_watchdog = False
 
+from bpython.test import mock
 
 @unittest.skipIf(not has_watchdog, "watchdog not available")
 class TestModuleChangeEventHandler(unittest.TestCase):
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -4,16 +4,14 @@
 import socket
 from six.moves import range
 
-from mock import Mock
-
 try:
     import unittest2 as unittest
 except ImportError:
     import unittest
 
 from bpython._py3compat import py3
 from bpython import config, repl, cli, autocomplete
-from bpython.test import MagicIterMock
+from bpython.test import MagicIterMock, mock
 
 
 def setup_config(conf):
@@ -99,7 +97,7 @@ def test_update(self):
         self.assertEqual(list(slice), self.matches)
 
         newmatches = ['string', 'str', 'set']
-        completer = Mock()
+        completer = mock.Mock()
         completer.locate.return_value = (0, 1, 's')
         self.matches_iterator.update(1, 's', newmatches, completer)
 
@@ -108,7 +106,7 @@ def test_update(self):
         self.assertEqual(list(newslice), newmatches)
 
     def test_cur_line(self):
-        completer = Mock()
+        completer = mock.Mock()
         completer.locate.return_value = (
             0,
             self.matches_iterator.orig_cursor_offset,
@@ -363,7 +361,7 @@ def test_atbol(self):
         self.assertFalse(self.repl.atbol())
 
     def test_addstr(self):
-        self.repl.complete = Mock(True)
+        self.repl.complete = mock.Mock(True)
 
         self.repl.s = "foo"
         self.repl.addstr("bar")
@@ -386,11 +384,11 @@ def test_simple_tab_complete(self):
             self.repl.matches_iter.__bool__.return_value = False
         else:
             self.repl.matches_iter.__nonzero__.return_value = False
-        self.repl.complete = Mock()
-        self.repl.print_line = Mock()
+        self.repl.complete = mock.Mock()
+        self.repl.print_line = mock.Mock()
         self.repl.matches_iter.is_cseq.return_value = False
-        self.repl.show_list = Mock()
-        self.repl.argspec = Mock()
+        self.repl.show_list = mock.Mock()
+        self.repl.argspec = mock.Mock()
         self.repl.matches_iter.cur_line.return_value = (None, "foobar")
 
         self.repl.s = "foo"
@@ -420,22 +418,22 @@ def test_normal_tab(self):
         """make sure pressing the tab key will
            still in some cases add a tab"""
         self.repl.s = ""
-        self.repl.config = Mock()
+        self.repl.config = mock.Mock()
         self.repl.config.tab_length = 4
-        self.repl.complete = Mock()
-        self.repl.print_line = Mock()
+        self.repl.complete = mock.Mock()
+        self.repl.print_line = mock.Mock()
         self.repl.tab()
         self.assertEqual(self.repl.s, "    ")
 
     def test_back_parameter(self):
-        self.repl.matches_iter = Mock()
+        self.repl.matches_iter = mock.Mock()
         self.repl.matches_iter.matches = True
         self.repl.matches_iter.previous.return_value = "previtem"
         self.repl.matches_iter.is_cseq.return_value = False
-        self.repl.show_list = Mock()
-        self.repl.argspec = Mock()
+        self.repl.show_list = mock.Mock()
+        self.repl.argspec = mock.Mock()
         self.repl.matches_iter.cur_line.return_value = (None, "previtem")
-        self.repl.print_line = Mock()
+        self.repl.print_line = mock.Mock()
         self.repl.s = "foo"
         self.repl.cpos = 0
         self.repl.tab(back=True)
@@ -465,10 +463,10 @@ def test_fuzzy_attribute_tab_complete2(self):
     def test_simple_expand(self):
         self.repl.s = "f"
         self.cpos = 0
-        self.repl.matches_iter = Mock()
+        self.repl.matches_iter = mock.Mock()
         self.repl.matches_iter.is_cseq.return_value = True
         self.repl.matches_iter.substitute_cseq.return_value = (3, "foo")
-        self.repl.print_line = Mock()
+        self.repl.print_line = mock.Mock()
         self.repl.tab()
         self.assertEqual(self.repl.s, "foo")
 
diff --git a/setup.py b/setup.py
@@ -204,9 +204,12 @@ def initialize_options(self):
     install_requires.append('ndg-httpsclient')
     install_requires.append('pyasn1')
 
-tests_require = ['mock']
+tests_require = []
 if sys.version_info[0] == 2 and sys.version_info[1] < 7:
     tests_require.append('unittest2')
+if (sys.version_info[0] == 2 or
+        (sys.version_info[0] == 3 and sys.version_info[0] < 3)):
+    tests_require.append('mock')
 
 # translations
 mo_files = list()
