Migrate to unittest.mock

src/pdm/framework/RESTClient.py

@@ -170,10 +170,10 @@ def patch_client(target, test_client, base_uri='/'):
         # We import mock here as TestClient is only meant for use in the tests
         # If we import it globally, it'll break importing this module in
         # production.
-        import mock
+        import unittest.mock
         # We patch away the base class of the target, replacing it with
         # RESTClientTest instead.
-        patcher = mock.patch.object(target, '__bases__', (RESTClientTest, ))
+        patcher = unittest.mock.patch.object(target, '__bases__', (RESTClientTest, ))
         patcher.start()
         # is_local is required to prevent mock from attempting to delete
         # __bases__ when stop is called (which would throw an exception)

test/pdm/CLI/test_usercommand.py

@@ -1,5 +1,5 @@
-import mock
 import unittest
+import unittest.mock as mock
 import argparse
 import tempfile
 import datetime

test/pdm/demo/test_DemoClient.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-import mock
 import unittest
+import unittest.mock as mock
 
 from pdm.demo.DemoClient import DemoClient
 from pdm.demo.DemoService import DemoService

test/pdm/framework/test_Database.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env
 """ Framework database object tests. """
 
-import mock
 import json
 import datetime
 import unittest
+import unittest.mock as mock
 
 from pdm.framework.Database import MemSafeSQLAlchemy
 from pdm.framework.Database import JSONMixin, JSONTableEncoder

test/pdm/framework/test_RESTClient.py

@@ -2,8 +2,8 @@
 """ Test RESTClient framework module. """
 
 import json
-import mock
 import unittest
+import unittest.mock as mock
 import functools
 import requests
 

test/pdm/framework/test_WSGIServer.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 """ Tests for the WSGIServer module. """
 
-import mock
 import unittest
+import unittest.mock as mock
 
 from pdm.framework.WSGIServer import WSGIAuth, WSGIServer
 

test/pdm/site/test_SiteClient.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 """ Test SiteService client class. """
 
-import mock
 import logging
 import datetime
 import unittest
+import unittest.mock as mock
 
 from pdm.site.SiteClient import SiteClient
 from pdm.site.SiteService import SiteService

test/pdm/site/test_SiteService.py

@@ -3,10 +3,10 @@
 
 import copy
 import json
-import mock
 import logging
 import datetime
 import unittest
+import unittest.mock as mock
 
 from flask import current_app
 from pdm.site.SiteService import SiteService

test/pdm/userservicedesk/test_HRClient.py

@@ -4,7 +4,7 @@
 
 import json
 import unittest
-import mock
+import unittest.mock as mock
 import datetime
 
 from pdm.userservicedesk.HRClient import HRClient

test/pdm/userservicedesk/test_HRService.py

@@ -2,7 +2,7 @@
 import os
 import time
 import unittest
-import mock
+import unittest.mock as mock
 import copy
 import datetime
 import smtplib

test/pdm/userservicedesk/test_TransferClient.py

@@ -1,5 +1,5 @@
-import mock
 import unittest
+import unittest.mock as mock
 import datetime
 from pdm.userservicedesk.TransferClientFacade import TransferClientFacade
 from pdm.framework.FlaskWrapper import FlaskServer

test/pdm/utils/test_X509.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 import os
-import mock
 import unittest
+import unittest.mock as mock
 from functools import partial
 
 from pdm.utils.X509 import X509Utils

test/pdm/utils/test_db.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 """ Test DB utils. """
 
-import mock
 import unittest
+import unittest.mock as mock
 
 from pdm.utils.db import managed_session
 

test/pdm/utils/test_lockfile.py

@@ -2,9 +2,9 @@
 """ Test of utils lockfile module. """
 
 import os
-import mock
 import fcntl
 import unittest
+import unittest.mock as mock
 
 from pdm.utils.lockfile import PIDLockFile, AlreadyLockedError
 

test/pdm/utils/test_myproxy.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 import os
-import mock
 import unittest
+import unittest.mock as mock
 
 from pdm.utils.myproxy import MyProxyUtils
 

test/pdm/web/test_WebPageService.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import unittest
-import mock
+import unittest.mock as mock
 
 from pdm.web.WebPageService import WebPageService
 from pdm.framework.FlaskWrapper import FlaskServer

test/pdm/workqueue/scripts/test_stdout_dump_helper.py

@@ -2,7 +2,7 @@
 import unittest
 import logging
 
-import mock
+import unittest.mock as mock
 
 from pdm.workqueue.scripts import stdout_dump_helper
 

test/pdm/workqueue/test_Worker.py

@@ -2,7 +2,7 @@
 """ Test Worker module. """
 import logging
 import unittest
-import mock
+import unittest.mock as mock
 
 from pdm.framework.FlaskWrapper import FlaskServer, jsonify
 from pdm.framework.RESTClient import RESTClientTest

test/pdm/workqueue/test_WorkqueueClient.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """ Test WorkqueueClient module. """
 import unittest
-import mock
+import unittest.mock as mock
 
 from pdm.framework.FlaskWrapper import FlaskServer, jsonify
 from pdm.framework.RESTClient import RESTClientTest

test/pdm/workqueue/test_WorkqueueService.py

@@ -3,7 +3,7 @@
 import json
 import unittest
 from textwrap import dedent
-import mock
+import unittest.mock as mock
 
 from pdm.framework.FlaskWrapper import FlaskServer
 from pdm.workqueue.WorkqueueDB import JobType, JobStatus, JobProtocol

tox.ini

@@ -10,7 +10,6 @@ sitepackages=True
 # Standard unit testing + coverage
 [testenv:unit]
 deps=
-  mock
   pytest
   coverage
 commands=
@@ -26,7 +25,6 @@ commands=
 
 [testenv:lint]
 deps=
-  mock
   pylint
 commands=
   /bin/bash test/bin/run_pylint.sh