Merge pull request #171 from eli-schwartz/unittest-mock

use stdlib unittest.mock on python 3

Author: charlch

pytest-profiling/tests/unit/test_profile.py

@@ -8,7 +8,12 @@
 reload_module(pytest_profiling)
 
 from pytest_profiling import Profiling, pytest_addoption, pytest_configure
-from mock import Mock, ANY, patch, sentinel
+
+try:
+    from unittest.mock import Mock, ANY, patch, sentinel
+except ImportError:
+    # python 2
+    from mock import Mock, ANY, patch, sentinel
 
 
 def test_creates_prof_dir():

pytest-server-fixtures/setup.py

@@ -43,7 +43,7 @@
 }
 
 tests_require = [
-                 'mock',
+                 'mock; python_version<"3.3"',
                  'psutil',
                  ]
 

pytest-server-fixtures/tests/integration/test_jenkins_server.py

@@ -1,7 +1,11 @@
 import os.path
 from pytest import raises
 
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    # python 2
+    from mock import patch
 
 
 # patch out any changes you want to the Jenkins server here:

pytest-server-fixtures/tests/integration/test_xvfb_server.py

@@ -4,7 +4,12 @@
 
 from itertools import chain, repeat
 
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    # python 2
+    from mock import patch
+
 import pytest
 from pytest import raises
 

pytest-server-fixtures/tests/unit/serverclass/test_docker_unit.py

@@ -1,4 +1,8 @@
-from mock import sentinel, patch, Mock
+try:
+    from unittest.mock import sentinel, patch, Mock
+except ImportError:
+    # python 2
+    from mock import sentinel, patch, Mock
 
 from pytest_server_fixtures.serverclass.docker import DockerServer
 
@@ -13,4 +17,3 @@ def test_init(mock_init):
     mock_init.assert_called_with(sentinel.cmd,
                                  sentinel.get_args,
                                  sentinel.env)
-

pytest-server-fixtures/tests/unit/serverclass/test_kubernetes_unit.py

@@ -1,6 +1,10 @@
 import pytest
 
-from mock import sentinel, patch, Mock
+try:
+    from unittest.mock import sentinel, patch, Mock
+except ImportError:
+    # python 2
+    from mock import sentinel, patch, Mock
 
 from pytest_server_fixtures.serverclass.kubernetes import KubernetesServer
 
@@ -16,4 +20,3 @@ def test_init(mock_init):
     mock_init.assert_called_with(sentinel.cmd,
                                  sentinel.get_args,
                                  sentinel.env)
-

pytest-server-fixtures/tests/unit/serverclass/test_thread_unit.py

@@ -1,4 +1,8 @@
-from mock import sentinel, patch, Mock
+try:
+    from unittest.mock import sentinel, patch, Mock
+except ImportError:
+    # python 2
+    from mock import sentinel, patch, Mock
 
 from pytest_server_fixtures import CONFIG
 from pytest_server_fixtures.serverclass.thread import ThreadServer
@@ -19,4 +23,3 @@ def test_init(mock_init):
     assert ts._hostname == sentinel.listen_hostname
     assert ts._workspace == sentinel.workspace
     assert ts._cwd == sentinel.cwd
-

pytest-server-fixtures/tests/unit/test_server_unit.py

@@ -1,4 +1,8 @@
-from mock import create_autospec, sentinel, call, patch, Mock
+try:
+    from unittest.mock import create_autospec, sentinel, call, patch, Mock
+except ImportError:
+    # python 2
+    from mock import create_autospec, sentinel, call, patch, Mock
 
 from pytest_server_fixtures.base import TestServer as _TestServer  # So that pytest doesnt think this is a test case
 

pytest-server-fixtures/tests/unit/test_server_v2_unit.py

@@ -1,4 +1,8 @@
-from mock import create_autospec, sentinel, call, patch, Mock
+try:
+    from unittest.mock import create_autospec, sentinel, call, patch, Mock
+except ImportError:
+    # python 2
+    from mock import create_autospec, sentinel, call, patch, Mock
 
 from pytest_server_fixtures.base2 import TestServerV2 as _TestServerV2 # TODO: why as _TestServerV2?
 
@@ -15,4 +19,3 @@ def test_init():
 def test_hostname_when_server_is_not_started():
     ts = _TestServerV2()
     assert ts.hostname == None
-

pytest-shutil/pytest_shutil/run.py

@@ -11,7 +11,12 @@
 from contextlib import closing
 import subprocess
 
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    # python 2
+    from mock import patch
+
 import execnet
 from six.moves import cPickle  # @UnresolvedImport