Use unittest.mock instead of the mock package

tools/ci/tc/tests/test_decision.py

@@ -1,4 +1,5 @@
-import mock
+from unittest import mock
+
 import pytest
 
 from tools.ci.tc import decision

tools/ci/tc/tests/test_valid.py

@@ -1,8 +1,8 @@
 import json
 import os
+from unittest import mock
 
 import jsone
-import mock
 import pytest
 import requests
 import yaml

tools/lint/tests/test_lint.py

@@ -1,8 +1,7 @@
 import io
 import os
 import sys
-
-import mock
+from unittest import mock
 
 from ...localpaths import repo_root
 from .. import lint as lint_mod

tools/lint/tests/test_path_lints.py

@@ -1,5 +1,5 @@
-import mock
 import os
+from unittest import mock
 
 from ..lint import check_path, check_unique_case_insensitive_paths
 from .base import check_errors

tools/manifest/tests/test_manifest.py

@@ -1,6 +1,5 @@
 import os
-
-import mock
+from unittest import mock
 
 import hypothesis as h
 import hypothesis.strategies as hs

tools/manifest/tests/test_utils.py

@@ -1,7 +1,6 @@
 import os
 import subprocess
-
-import mock
+from unittest import mock
 
 from .. import utils
 

tools/requirements_pytest.txt

@@ -1,4 +1,3 @@
 pytest==6.2.4
 pytest-cov==2.12.1
-mock==4.0.3
 hypothesis==6.14.0

tools/wpt/tests/test_browser.py

@@ -1,9 +1,10 @@
 import logging
 import inspect
-import mock
-import pytest
 import subprocess
 import sys
+from unittest import mock
+
+import pytest
 
 from tools.wpt import browser
 

tools/wpt/tests/test_revlist.py

@@ -1,4 +1,5 @@
-import mock
+from unittest import mock
+
 from tools.wpt import revlist
 
 

tools/wpt/tests/test_run.py

@@ -1,7 +1,7 @@
-import mock
 import tempfile
 import shutil
 import sys
+from unittest import mock
 
 import pytest
 

tools/wpt/tests/test_testfiles.py

@@ -1,5 +1,5 @@
 import os.path
-from mock import patch
+from unittest.mock import patch
 
 from tools.manifest.manifest import Manifest
 from tools.wpt import testfiles

tools/wptrunner/wptrunner/tests/browsers/test_sauce.py

@@ -1,7 +1,7 @@
 import logging
 import sys
+from unittest import mock
 
-import mock
 import pytest
 
 from os.path import join, dirname

tools/wptrunner/wptrunner/tests/test_products.py

@@ -1,6 +1,6 @@
 from os.path import join, dirname
+from unittest import mock
 
-import mock
 import pytest
 
 from .base import all_products, active_products

tools/wptrunner/wptrunner/tests/test_update.py

@@ -1,9 +1,10 @@
 import json
-import mock
 import os
-import pytest
 import sys
 from io import BytesIO
+from unittest import mock
+
+import pytest
 
 from .. import metadata, manifestupdate
 from ..update.update import WPTUpdate

tools/wptrunner/wptrunner/tests/test_wpttest.py

@@ -1,5 +1,5 @@
-import mock
 from io import BytesIO
+from unittest import mock
 
 from manifest import manifest as wptmanifest
 from manifest.item import TestharnessTest, RefTest

tools/wptserve/tests/test_request.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 from wptserve.request import Request, RequestHeaders, MultiDict
 

tools/wptserve/tests/test_response.py

@@ -1,5 +1,5 @@
-import mock
 from io import BytesIO
+from unittest import mock
 
 from wptserve.response import Response