Switch to unittest.mock

azure-pipelines.yml

@@ -18,8 +18,8 @@ jobs:
     vmImage: 'ubuntu-16.04'
   strategy:
     matrix:
-      'Python 3.5':
-        YCM_PYTHON_VERSION: '3.5.3'
+      'Python 3.6':
+        YCM_PYTHON_VERSION: '3.6.3'
     maxParallel: 2
   variables:
     COVERAGE: true
@@ -45,7 +45,7 @@ jobs:
     vmImage: 'ubuntu-16.04'
   strategy:
     matrix:
-      'Python 3.5':
+      'Python 3.6':
         IMAGE: ycm-vim-py3
         PIP: pip3
     maxParallel: 2
@@ -75,8 +75,8 @@ jobs:
     vmImage: 'macOS-10.13'
   strategy:
     matrix:
-      'Python 3.5':
-        YCM_PYTHON_VERSION: '3.5.3'
+      'Python 3.6':
+        YCM_PYTHON_VERSION: '3.6.3'
     maxParallel: 2
   variables:
     COVERAGE: true

python/ycm/tests/base_test.py

@@ -18,7 +18,7 @@
 
 import contextlib
 from hamcrest import assert_that, equal_to
-from mock import patch
+from unittest.mock import patch
 
 from ycm.tests.test_utils import MockVimModule
 vim_mock = MockVimModule()

python/ycm/tests/client/base_request_test.py

@@ -19,7 +19,7 @@ from ycm.tests.test_utils import MockVimBuffers, MockVimModule, VimBuffer
 MockVimModule()
 
 from hamcrest import assert_that, has_entry
-from mock import patch
+from unittest.mock import patch
 from ycm.client.base_request import BuildRequestData
 
 

python/ycm/tests/client/command_request_test.py

@@ -20,7 +20,7 @@ MockVimModule()
 
 import json
 from hamcrest import assert_that
-from mock import patch, call
+from unittest.mock import patch, call
 from ycm.client.command_request import CommandRequest
 
 

python/ycm/tests/client/messages_request_test.py

@@ -19,7 +19,7 @@ from ycm.tests.test_utils import MockVimModule
 MockVimModule()
 
 from hamcrest import assert_that, equal_to
-from mock import patch, call
+from unittest.mock import patch, call
 
 from ycm.client.messages_request import _HandlePollResponse
 from ycm.tests.test_utils import ExtendedMock

python/ycm/tests/client/omni_completion_request_tests.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
 
-from mock import MagicMock
+from unittest.mock import MagicMock
 from hamcrest import assert_that, has_entries
 
 from ycm.client.omni_completion_request import OmniCompletionRequest

python/ycm/tests/command_test.py

@@ -19,7 +19,7 @@ from ycm.tests.test_utils import MockVimModule, MockVimBuffers, VimBuffer
 MockVimModule()
 
 from hamcrest import assert_that, contains_exactly, has_entries
-from mock import patch
+from unittest.mock import patch
 
 from ycm.tests import YouCompleteMeInstance
 

python/ycm/tests/completion_test.py

@@ -21,7 +21,7 @@ MockVimModule()
 
 import contextlib
 from hamcrest import assert_that, contains_exactly, empty, has_entries
-from mock import call, MagicMock, patch
+from unittest.mock import call, MagicMock, patch
 
 from ycm.tests import PathToTestFile, YouCompleteMeInstance
 from ycmd.responses import ServerError

python/ycm/tests/event_notification_test.py

@@ -32,7 +32,7 @@ from ycmd.responses import ( BuildDiagnosticData, Diagnostic, Location, Range,
 from hamcrest import ( assert_that, contains_exactly, empty, equal_to,
                        has_entries, has_entry, has_item, has_items, has_key,
                        is_not )
-from mock import call, MagicMock, patch
+from unittest.mock import call, MagicMock, patch
 
 
 def PresentDialog_Confirm_Call( message ):

python/ycm/tests/mock_utils.py

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
-import mock
+from unittest import mock
 import requests
 
 

python/ycm/tests/postcomplete_test.py

@@ -21,12 +21,9 @@ from ycm.tests.test_utils import MockVimModule
 MockVimModule()
 
 import contextlib
-<<<<<<< HEAD
 import json
-=======
-from hamcrest import assert_that, empty, equal_to, none
->>>>>>> Drop nose.tools
-from mock import MagicMock, DEFAULT, patch
+from hamcrest import assert_that, contains_exactly, empty, equal_to, none
+from unittest.mock import MagicMock, DEFAULT, patch
 
 from ycm import vimsupport
 from ycmd.utils import ToBytes
@@ -344,13 +341,8 @@ def GetExtraDataUserMayHaveCompleted_UseUserData1_test( *args ):
   ]
 
   with _SetupForCsharpCompletionDone( completions ) as request:
-<<<<<<< HEAD
-    eq_( request._GetExtraDataUserMayHaveCompleted(),
-         [ BuildCompletionNamespace( 'namespace2' )[ 'extra_data' ] ] )
-=======
     assert_that( request._GetCompletionsUserMayHaveCompleted(),
-                 equal_to( [ BuildCompletionNamespace( 'namespace2' ) ] ) )
->>>>>>> Drop nose.tools
+                 contains_exactly( BuildCompletionNamespace( 'namespace2' ) ) )
 
 
 @patch( 'ycm.vimsupport.GetVariableValue',
@@ -363,11 +355,7 @@ def GetExtraDataUserMayHaveCompleted_EmptyUserData_test( *args ):
   ]
 
   with _SetupForCsharpCompletionDone( completions ) as request:
-<<<<<<< HEAD
-    eq_( request._GetExtraDataUserMayHaveCompleted(), [] )
-=======
     assert_that( request._GetCompletionsUserMayHaveCompleted(), empty() )
->>>>>>> Drop nose.tools
 
 
 @patch( 'ycm.vimsupport.GetVariableValue',

python/ycm/tests/test_utils.py

@@ -16,7 +16,7 @@
 # along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
 
 from collections import defaultdict, namedtuple
-from mock import DEFAULT, MagicMock, patch
+from unittest.mock import DEFAULT, MagicMock, patch
 from hamcrest import assert_that, equal_to
 import contextlib
 import functools
@@ -618,7 +618,7 @@ def MockVimModule():
   next test. That is:
 
     from ycm.tests.test_utils import MockVimModule
-    from mock import patch
+    from unittest.mock import patch
 
     # Do this once
     MockVimModule()

python/ycm/tests/vimsupport_test.py

@@ -23,7 +23,7 @@ MockVimModule()
 from ycm import vimsupport
 from hamcrest import ( assert_that, calling, contains_exactly, empty, equal_to,
                        has_entry, is_not, raises )
-from mock import MagicMock, call, patch
+from unittest.mock import MagicMock, call, patch
 from ycmd.utils import ToBytes
 import os
 import json

python/ycm/tests/youcompleteme_test.py

@@ -29,7 +29,7 @@ import os
 import sys
 from hamcrest import ( assert_that, contains_exactly, empty, equal_to,
                        has_entries, is_in, is_not, matches_regexp )
-from mock import call, MagicMock, patch
+from unittest.mock import call, MagicMock, patch
 
 from ycm import vimsupport
 from ycm.paths import _PathToPythonUsedDuringBuild