From ff617a633076c248564423f4d61abd3c7c1830b1 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 4 Feb 2025 14:42:00 +1100 Subject: [PATCH 1/4] pytest-profiling: Clean up remaining Python 2 code --- pytest-profiling/tests/unit/test_profile.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pytest-profiling/tests/unit/test_profile.py b/pytest-profiling/tests/unit/test_profile.py index 1705ad7..9a1eea1 100644 --- a/pytest-profiling/tests/unit/test_profile.py +++ b/pytest-profiling/tests/unit/test_profile.py @@ -4,6 +4,7 @@ import importlib import os.path +from unittest.mock import Mock, ANY, patch, sentinel, call import pytest_profiling @@ -14,12 +15,6 @@ from pytest_profiling import Profiling, pytest_addoption, pytest_configure -try: - from unittest.mock import Mock, ANY, patch, sentinel, call -except ImportError: - # python 2 - from mock import Mock, ANY, patch, sentinel - def test_creates_prof_dir(): with patch("os.makedirs", side_effect=OSError) as makedirs: From 7284983b5c52a665819141d61c84cb6066e5b635 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 4 Feb 2025 14:45:58 +1100 Subject: [PATCH 2/4] python-server-fixtures: Clean up remaining Python 2 code --- .../tests/integration/test_jenkins_server.py | 8 ++------ .../tests/integration/test_xvfb_server.py | 7 +------ .../tests/unit/serverclass/test_docker_unit.py | 6 +----- .../tests/unit/serverclass/test_kubernetes_unit.py | 9 +++------ .../tests/unit/serverclass/test_thread_unit.py | 6 +----- pytest-server-fixtures/tests/unit/test_server_unit.py | 6 +----- pytest-server-fixtures/tests/unit/test_server_v2_unit.py | 7 ++----- 7 files changed, 11 insertions(+), 38 deletions(-) diff --git a/pytest-server-fixtures/tests/integration/test_jenkins_server.py b/pytest-server-fixtures/tests/integration/test_jenkins_server.py index b9abf07..91487c1 100644 --- a/pytest-server-fixtures/tests/integration/test_jenkins_server.py +++ b/pytest-server-fixtures/tests/integration/test_jenkins_server.py @@ -1,11 +1,7 @@ import os.path -from pytest import raises +from unittest.mock import patch -try: - from unittest.mock import patch -except ImportError: - # python 2 - from mock import patch +from pytest import raises # patch out any changes you want to the Jenkins server here: diff --git a/pytest-server-fixtures/tests/integration/test_xvfb_server.py b/pytest-server-fixtures/tests/integration/test_xvfb_server.py index 96d6315..efb64b6 100644 --- a/pytest-server-fixtures/tests/integration/test_xvfb_server.py +++ b/pytest-server-fixtures/tests/integration/test_xvfb_server.py @@ -3,12 +3,7 @@ import time from itertools import chain, repeat - -try: - from unittest.mock import patch -except ImportError: - # python 2 - from mock import patch +from unittest.mock import patch import pytest from pytest import raises diff --git a/pytest-server-fixtures/tests/unit/serverclass/test_docker_unit.py b/pytest-server-fixtures/tests/unit/serverclass/test_docker_unit.py index 1d2593d..c86409f 100644 --- a/pytest-server-fixtures/tests/unit/serverclass/test_docker_unit.py +++ b/pytest-server-fixtures/tests/unit/serverclass/test_docker_unit.py @@ -1,8 +1,4 @@ -try: - from unittest.mock import sentinel, patch, Mock -except ImportError: - # python 2 - from mock import sentinel, patch, Mock +from unittest.mock import sentinel, patch, Mock from pytest_server_fixtures.serverclass.docker import DockerServer diff --git a/pytest-server-fixtures/tests/unit/serverclass/test_kubernetes_unit.py b/pytest-server-fixtures/tests/unit/serverclass/test_kubernetes_unit.py index 098687d..70816a8 100644 --- a/pytest-server-fixtures/tests/unit/serverclass/test_kubernetes_unit.py +++ b/pytest-server-fixtures/tests/unit/serverclass/test_kubernetes_unit.py @@ -1,13 +1,10 @@ -import pytest +from unittest.mock import sentinel, patch, Mock -try: - from unittest.mock import sentinel, patch, Mock -except ImportError: - # python 2 - from mock import sentinel, patch, Mock +import pytest from pytest_server_fixtures.serverclass.kubernetes import KubernetesServer + @pytest.mark.skip(reason="Need a way to run this test in Kubernetes") @patch('pytest_server_fixtures.serverclass.docker.ServerClass.__init__') def test_init(mock_init): diff --git a/pytest-server-fixtures/tests/unit/serverclass/test_thread_unit.py b/pytest-server-fixtures/tests/unit/serverclass/test_thread_unit.py index f4f6273..0faa071 100644 --- a/pytest-server-fixtures/tests/unit/serverclass/test_thread_unit.py +++ b/pytest-server-fixtures/tests/unit/serverclass/test_thread_unit.py @@ -1,8 +1,4 @@ -try: - from unittest.mock import sentinel, patch, Mock -except ImportError: - # python 2 - from mock import sentinel, patch, Mock +from unittest.mock import sentinel, patch, Mock from pytest_server_fixtures import CONFIG from pytest_server_fixtures.serverclass.thread import ThreadServer diff --git a/pytest-server-fixtures/tests/unit/test_server_unit.py b/pytest-server-fixtures/tests/unit/test_server_unit.py index 48f29ea..f7932fb 100644 --- a/pytest-server-fixtures/tests/unit/test_server_unit.py +++ b/pytest-server-fixtures/tests/unit/test_server_unit.py @@ -1,8 +1,4 @@ -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 unittest.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 diff --git a/pytest-server-fixtures/tests/unit/test_server_v2_unit.py b/pytest-server-fixtures/tests/unit/test_server_v2_unit.py index b6e6a64..f61c2d7 100644 --- a/pytest-server-fixtures/tests/unit/test_server_v2_unit.py +++ b/pytest-server-fixtures/tests/unit/test_server_v2_unit.py @@ -1,11 +1,8 @@ -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 unittest.mock import create_autospec, sentinel, call, patch, Mock from pytest_server_fixtures.base2 import TestServerV2 as _TestServerV2 # TODO: why as _TestServerV2? + def test_init(): with patch('pytest_shutil.workspace.Workspace.__init__', autospec=True) as init: ts = _TestServerV2(cwd=sentinel.cwd, From 328e6946e58ad27a7ee2bb422ad8dd089422b6fd Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 4 Feb 2025 14:46:50 +1100 Subject: [PATCH 3/4] python-verbose-parametrize: Clean up remaining Python 2 code --- .../tests/unit/test_verbose_parametrize.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pytest-verbose-parametrize/tests/unit/test_verbose_parametrize.py b/pytest-verbose-parametrize/tests/unit/test_verbose_parametrize.py index bba9aa6..d5a9023 100644 --- a/pytest-verbose-parametrize/tests/unit/test_verbose_parametrize.py +++ b/pytest-verbose-parametrize/tests/unit/test_verbose_parametrize.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- -try: - from unittest.mock import Mock -except ImportError: - from mock import Mock +from unittest.mock import Mock from pytest_verbose_parametrize import pytest_generate_tests From 77900db1cd24f77e5896948724b45c7bbb5266cc Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 4 Feb 2025 14:47:40 +1100 Subject: [PATCH 4/4] python-webdriver: Clean up remaining Python 2 code --- pytest-webdriver/tests/integration/test_integration.py | 6 +----- pytest-webdriver/tests/unit/test_webdriver.py | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pytest-webdriver/tests/integration/test_integration.py b/pytest-webdriver/tests/integration/test_integration.py index 9581555..7e9f09c 100644 --- a/pytest-webdriver/tests/integration/test_integration.py +++ b/pytest-webdriver/tests/integration/test_integration.py @@ -1,8 +1,4 @@ -try: - from unittest.mock import Mock, sentinel, patch -except ImportError: - # python 2 - from mock import Mock, sentinel, patch +from unittest.mock import Mock, sentinel, patch import pytest import selenium diff --git a/pytest-webdriver/tests/unit/test_webdriver.py b/pytest-webdriver/tests/unit/test_webdriver.py index decde8c..da6f90c 100644 --- a/pytest-webdriver/tests/unit/test_webdriver.py +++ b/pytest-webdriver/tests/unit/test_webdriver.py @@ -1,8 +1,4 @@ -try: - from unittest.mock import Mock, sentinel, patch -except ImportError: - # python 2 - from mock import Mock, sentinel, patch +from unittest.mock import Mock, sentinel, patch import pytest import selenium