21721: Remove tests_require=mock

unittest.mock in the stdlib is good enough for us.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 551bd964b1dd152b1c26f073a97c42eaf50d614c..ea2c4c0ef0372a029736dfdaabf9942d092b2f21 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -46,8 +46,5 @@ setup(name='arvados-cwl-runner',
           'Programming Language :: Python :: 3',
       ],
       test_suite='tests',
-      tests_require=[
-          'mock>=1.0,<4',
-      ],
       zip_safe=True,
 )

diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py
index b95b8eb67bbc4d83b357fcb209bccaf6ebf7dca4..af8c0b014dd83deee648c60b58d757c8e2e69a35 100644 (file)
--- a/sdk/cwl/tests/test_container.py
+++ b/sdk/cwl/tests/test_container.py
@@ -12,7 +12,6 @@ import arvados_cwl.util
 import copy
 import arvados.config
 import logging
-import mock
 import unittest
 import os
 import functools
@@ -25,6 +24,8 @@ from schema_salad.ref_resolver import Loader
 from schema_salad.sourceline import cmap
 import io
 
+from unittest import mock
+
 from .matcher import JsonDiffMatcher, StripYAMLComments
 from .mock_discovery import get_rootDesc
 

diff --git a/sdk/cwl/tests/test_fsaccess.py b/sdk/cwl/tests/test_fsaccess.py
index f83612a8b01186d822eb00728a76d31569408ced..c086f0e832f29526a4880908bf7176e5d9c39737 100644 (file)
--- a/sdk/cwl/tests/test_fsaccess.py
+++ b/sdk/cwl/tests/test_fsaccess.py
@@ -3,13 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import functools
-import mock
 import sys
 import unittest
 import json
 import logging
 import os
 
+from unittest import mock
+
 import arvados
 import arvados.keep
 import arvados.collection

diff --git a/sdk/cwl/tests/test_make_output.py b/sdk/cwl/tests/test_make_output.py
index dd1da0b524429bb2038fe56fab86b8f2abe7c6b7..0a4fbdc60fbf450e7fb7819453549083ac3336f6 100644 (file)
--- a/sdk/cwl/tests/test_make_output.py
+++ b/sdk/cwl/tests/test_make_output.py
@@ -8,11 +8,12 @@ standard_library.install_aliases()
 import functools
 import json
 import logging
-import mock
 import os
 import io
 import unittest
 
+from unittest import mock
+
 import arvados
 import arvados_cwl
 import arvados_cwl.executor

diff --git a/sdk/cwl/tests/test_pathmapper.py b/sdk/cwl/tests/test_pathmapper.py
index 194092db7a0461e4174d12df3cd88c5a32a3cafc..1a13fc7079ba50b2fabfcebc49beb8c091809437 100644 (file)
--- a/sdk/cwl/tests/test_pathmapper.py
+++ b/sdk/cwl/tests/test_pathmapper.py
@@ -3,13 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import functools
-import mock
 import sys
 import unittest
 import json
 import logging
 import os
 
+from unittest import mock
+
 import arvados
 import arvados.keep
 import arvados.collection

diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index c956beda6a8c47ea088d61fc3de36869e065f569..a137325a443b70afda2510a3d48cb1a7b8294fe3 100644 (file)
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -12,7 +12,6 @@ import functools
 import hashlib
 import json
 import logging
-import mock
 import sys
 import unittest
 import cwltool.process
@@ -20,6 +19,7 @@ import re
 import os
 
 from io import BytesIO, StringIO
+from unittest import mock
 
 import arvados
 import arvados.collection

diff --git a/sdk/cwl/tests/test_tq.py b/sdk/cwl/tests/test_tq.py
index 05e5116d722fb75a59973cb4bfc0373999dff50d..bf53f8912e4446eff82011b397e9675807f31b2a 100644 (file)
--- a/sdk/cwl/tests/test_tq.py
+++ b/sdk/cwl/tests/test_tq.py
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import functools
-import mock
 import sys
 import unittest
 import json
@@ -11,6 +10,8 @@ import logging
 import os
 import threading
 
+from unittest import mock
+
 from cwltool.task_queue import TaskQueue
 
 def success_task():

diff --git a/sdk/cwl/tests/test_urljoin.py b/sdk/cwl/tests/test_urljoin.py
index 86a053ea484835980c791d4a728824919d01f78f..08bca55e3dc8aefba0963259759a4055df8a84d6 100644 (file)
--- a/sdk/cwl/tests/test_urljoin.py
+++ b/sdk/cwl/tests/test_urljoin.py
@@ -3,13 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import functools
-import mock
 import sys
 import unittest
 import json
 import logging
 import os
 
+from unittest import mock
+
 import arvados
 import arvados.keep
 import arvados.collection

diff --git a/sdk/cwl/tests/test_util.py b/sdk/cwl/tests/test_util.py
index bf3d6fe0ef3de8d46a1f372f39dbe0607fd8aef9..e7159f41020d8a9178586ed1461d214f954c431d 100644 (file)
--- a/sdk/cwl/tests/test_util.py
+++ b/sdk/cwl/tests/test_util.py
@@ -5,10 +5,11 @@
 from builtins import bytes
 
 import unittest
-import mock
 import datetime
 import httplib2
 
+from unittest import mock
+
 from arvados_cwl.util import *
 from arvados.errors import ApiError
 from arvados_cwl.util import common_prefix

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index c9a8516d078ce003ac292e4254f3419b285ecbf8..97c3e0a2bc42e806a9ccd40338655e100edb644a 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -128,6 +128,6 @@ setup(name='arvados-python-client',
           'Programming Language :: Python :: 3',
       ],
       test_suite='tests',
-      tests_require=['mock>=1.0,<4', 'PyYAML', 'parameterized'],
+      tests_require=['PyYAML', 'parameterized'],
       zip_safe=False
       )

diff --git a/sdk/python/tests/arvados_testutil.py b/sdk/python/tests/arvados_testutil.py
index 1cf1116b3faf050e433bbed05a748272262de7df..6d58b23360480e164580d4fd21cf634b47fed87d 100644 (file)
--- a/sdk/python/tests/arvados_testutil.py
+++ b/sdk/python/tests/arvados_testutil.py
@@ -11,7 +11,6 @@ import hashlib
 import http.client
 import httplib2
 import io
-import mock
 import os
 import pycurl
 import queue
@@ -21,6 +20,7 @@ import tempfile
 import unittest
 
 from io import StringIO, BytesIO
+from unittest import mock
 
 # Use this hostname when you want to make sure the traffic will be
 # instantly refused.  100::/64 is a dedicated black hole.

diff --git a/sdk/python/tests/test_api.py b/sdk/python/tests/test_api.py
index 0f85e5520c821dcaa7bf6690e7702cb857e3ac54..2768d2e7cfff61c56d1637aa1e9ed68edbf11af1 100644 (file)
--- a/sdk/python/tests/test_api.py
+++ b/sdk/python/tests/test_api.py
@@ -20,7 +20,7 @@ import sys
 import unittest
 import urllib.parse as urlparse
 
-import mock
+from unittest import mock
 from . import run_test_server
 
 from apiclient import errors as apiclient_errors

diff --git a/sdk/python/tests/test_arv_get.py b/sdk/python/tests/test_arv_get.py
index d12739f6f69235defbfccdf0ab1701a89e6bb8a4..b66039dfe31811680ce21be6bce57a81e6c908bf 100644 (file)
--- a/sdk/python/tests/test_arv_get.py
+++ b/sdk/python/tests/test_arv_get.py
@@ -6,12 +6,13 @@ from __future__ import absolute_import
 from future.utils import listitems
 import io
 import logging
-import mock
 import os
 import re
 import shutil
 import tempfile
 
+from unittest import mock
+
 import arvados
 import arvados.collection as collection
 import arvados.commands.get as arv_get

diff --git a/sdk/python/tests/test_arv_keepdocker.py b/sdk/python/tests/test_arv_keepdocker.py
index 9aebc0350424e0b4051d14687cf7c4376135c18c..5d23dfb378069219966a25c9fb2f8ce1a5a52437 100644 (file)
--- a/sdk/python/tests/test_arv_keepdocker.py
+++ b/sdk/python/tests/test_arv_keepdocker.py
@@ -8,13 +8,14 @@ import collections.abc
 import copy
 import hashlib
 import logging
-import mock
 import os
 import subprocess
 import sys
 import tempfile
 import unittest
+
 from pathlib import Path
+from unittest import mock
 
 import parameterized
 

diff --git a/sdk/python/tests/test_arv_ls.py b/sdk/python/tests/test_arv_ls.py
index 635c6254ad73f9c8d8178634c0ce33c0b038b0d0..d48b94ffacb6aebe2e77390163e238e96a7e85d2 100644 (file)
--- a/sdk/python/tests/test_arv_ls.py
+++ b/sdk/python/tests/test_arv_ls.py
@@ -8,9 +8,10 @@ from builtins import range
 import os
 import random
 import sys
-import mock
 import tempfile
 
+from unittest import mock
+
 import arvados.errors as arv_error
 import arvados.commands.ls as arv_ls
 from . import run_test_server

diff --git a/sdk/python/tests/test_arv_put.py b/sdk/python/tests/test_arv_put.py
index afdf2238a71caf8fb212d19527ceab79c27f8b96..772a4f6b3eb87f3b12fca7ed9aea594191b934da 100644 (file)
--- a/sdk/python/tests/test_arv_put.py
+++ b/sdk/python/tests/test_arv_put.py
@@ -16,7 +16,6 @@ import ciso8601
 import datetime
 import json
 import logging
-import mock
 import multiprocessing
 import os
 import pwd
@@ -32,6 +31,8 @@ import time
 import unittest
 import uuid
 
+from unittest import mock
+
 import arvados
 import arvados.commands.put as arv_put
 from . import arvados_testutil as tutil

diff --git a/sdk/python/tests/test_arvfile.py b/sdk/python/tests/test_arvfile.py
index 600f17baadb3bbf82fb79c02ad29ade34a3a53d3..b98e1e97d4fc8bf5c88c8303e52efdcb6d3f45aa 100644 (file)
--- a/sdk/python/tests/test_arvfile.py
+++ b/sdk/python/tests/test_arvfile.py
@@ -8,11 +8,12 @@ from builtins import str
 from builtins import range
 from builtins import object
 import datetime
-import mock
 import os
 import unittest
 import time
 
+from unittest import mock
+
 import arvados
 from arvados._ranges import Range
 from arvados.keep import KeepLocator

diff --git a/sdk/python/tests/test_cache.py b/sdk/python/tests/test_cache.py
index 259acd0a3079bdeba319c46e931617c15b9b8af4..d86c7337e124bfc6608d4ece513a71f17b63cf32 100644 (file)
--- a/sdk/python/tests/test_cache.py
+++ b/sdk/python/tests/test_cache.py
@@ -8,7 +8,6 @@ from __future__ import absolute_import
 from builtins import str
 from builtins import range
 import hashlib
-import mock
 import os
 import random
 import shutil
@@ -17,11 +16,12 @@ import tempfile
 import threading
 import unittest
 
+from unittest import mock
+
 import arvados
 import arvados.cache
 from . import run_test_server
 
-
 def _random(n):
     return bytearray(random.getrandbits(8) for _ in range(n))
 

diff --git a/sdk/python/tests/test_collections.py b/sdk/python/tests/test_collections.py
index 9e753506b3550d66b8939f355496c64f6abfb031..65b89056bb40837a133b6a793ddbfe2382f3de83 100644 (file)
--- a/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@ -7,7 +7,6 @@ from __future__ import absolute_import
 from builtins import object
 import arvados
 import copy
-import mock
 import os
 import random
 import re
@@ -18,6 +17,8 @@ import time
 import unittest
 import parameterized
 
+from unittest import mock
+
 from . import run_test_server
 from arvados._ranges import Range, LocatorAndRange
 from arvados.collection import Collection, CollectionReader

diff --git a/sdk/python/tests/test_events.py b/sdk/python/tests/test_events.py
index b4e6a0b1cd88204b2dc8f699c85d01e2c805abe1..a3a3267be7c4bde65a7dcd74cbbaf5b998a200cc 100644 (file)
--- a/sdk/python/tests/test_events.py
+++ b/sdk/python/tests/test_events.py
@@ -4,13 +4,14 @@
 
 import json
 import logging
-import mock
 import queue
 import sys
 import threading
 import time
 import unittest
 
+from unittest import mock
+
 import websockets.exceptions as ws_exc
 
 import arvados

diff --git a/sdk/python/tests/test_http.py b/sdk/python/tests/test_http.py
index bce57eda61b7be549af205525bb0c81eba9e035d..fb424743d9e97f77ce14d54029efa15b5b2b5549 100644 (file)
--- a/sdk/python/tests/test_http.py
+++ b/sdk/python/tests/test_http.py
@@ -11,11 +11,12 @@ import functools
 import hashlib
 import json
 import logging
-import mock
 import sys
 import unittest
 import datetime
 
+from unittest import mock
+
 import arvados
 import arvados.collection
 import arvados.keep

diff --git a/sdk/python/tests/test_keep_client.py b/sdk/python/tests/test_keep_client.py
index 8c0f096b616986211438c5365fc405dcba1c322d..5a065b2ee1166690676918526251605209647dda 100644 (file)
--- a/sdk/python/tests/test_keep_client.py
+++ b/sdk/python/tests/test_keep_client.py
@@ -10,8 +10,6 @@ from builtins import str
 from builtins import range
 from builtins import object
 import hashlib
-import mock
-from mock import patch
 import os
 import errno
 import pycurl
@@ -27,6 +25,9 @@ import unittest
 import urllib.parse
 import mmap
 
+from unittest import mock
+from unittest.mock import patch
+
 import parameterized
 
 import arvados

diff --git a/sdk/python/tests/test_retry.py b/sdk/python/tests/test_retry.py
index bcf784d13003a1de826e87d10f04d0a2f4a8d7d5..3f0064f96fc4296d6fb73dbc2a7fae14344da6e6 100644 (file)
--- a/sdk/python/tests/test_retry.py
+++ b/sdk/python/tests/test_retry.py
@@ -8,9 +8,10 @@ from builtins import object
 import itertools
 import unittest
 
+from unittest import mock
+
 import arvados.errors as arv_error
 import arvados.retry as arv_retry
-import mock
 
 class RetryLoopTestMixin(object):
     @staticmethod

diff --git a/sdk/python/tests/test_retry_job_helpers.py b/sdk/python/tests/test_retry_job_helpers.py
index 9389b25c88e10840b979f874369fbcbdb38f7540..f4e80e61fe9981fcd2b2a014fb077f11430c9232 100644 (file)
--- a/sdk/python/tests/test_retry_job_helpers.py
+++ b/sdk/python/tests/test_retry_job_helpers.py
@@ -4,7 +4,6 @@
 
 from __future__ import absolute_import
 from builtins import object
-import mock
 import os
 import unittest
 import hashlib
@@ -14,6 +13,7 @@ import arvados
 from . import arvados_testutil as tutil
 from apiclient import http as apiclient_http
 
+from unittest import mock
 
 @tutil.skip_sleep
 class ApiClientRetryTestMixin(object):

diff --git a/sdk/python/tests/test_sdk.py b/sdk/python/tests/test_sdk.py
index 41add57c0e4922b49bc87b4ffaba265624413a20..4ef81c53d8448222a7ca5b1c387ebb388d78faa3 100644 (file)
--- a/sdk/python/tests/test_sdk.py
+++ b/sdk/python/tests/test_sdk.py
@@ -2,10 +2,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import mock
 import os
 import unittest
 
+from unittest import mock
+
 import arvados
 import arvados.collection
 

diff --git a/sdk/python/tests/test_stream.py b/sdk/python/tests/test_stream.py
index 12a3340eab55e25593a1b9d29e2c9296e71039fe..374800c55b6f86fadf2a36a48ad181a1bbc2b4d3 100644 (file)
--- a/sdk/python/tests/test_stream.py
+++ b/sdk/python/tests/test_stream.py
@@ -7,11 +7,12 @@ from builtins import object
 import bz2
 import gzip
 import io
-import mock
 import os
 import unittest
 import hashlib
 
+from unittest import mock
+
 import arvados
 from arvados import StreamReader, StreamFileReader
 from arvados._ranges import Range

diff --git a/sdk/python/tests/test_vocabulary.py b/sdk/python/tests/test_vocabulary.py
index aa2e739e20d65849c5444471b24c5e34a5f4eac9..2f5db3b9d95bd0fbc041fd8fb8140194df6f6066 100644 (file)
--- a/sdk/python/tests/test_vocabulary.py
+++ b/sdk/python/tests/test_vocabulary.py
@@ -4,7 +4,8 @@
 
 import arvados
 import unittest
-import mock
+
+from unittest import mock
 
 from arvados import api, vocabulary
 

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 4519503c6988d08a2efc984ac673faac7b9a9caf..5a77174c62a24331d40440db92d2ecf6da44002e 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -45,6 +45,6 @@ setup(name='arvados_fuse',
           'Programming Language :: Python :: 3',
       ],
       test_suite='tests',
-      tests_require=['mock>=1.0', 'PyYAML', 'parameterized',],
+      tests_require=['PyYAML', 'parameterized',],
       zip_safe=False
       )

diff --git a/services/fuse/tests/test_command_args.py b/services/fuse/tests/test_command_args.py
index b08ab19335758be4c7ee4f72b91b4f3e26d04cea..90153d22d1befb270da11c8eeea28bf72dd343f5 100644 (file)
--- a/services/fuse/tests/test_command_args.py
+++ b/services/fuse/tests/test_command_args.py
@@ -14,7 +14,6 @@ import io
 import json
 import llfuse
 import logging
-import mock
 import os
 from . import run_test_server
 import sys
@@ -22,6 +21,8 @@ import tempfile
 import unittest
 import resource
 
+from unittest import mock
+
 def noexit(func):
     """If argparse or arvados_fuse tries to exit, fail the test instead"""
     class SystemExitCaught(Exception):

diff --git a/services/fuse/tests/test_inodes.py b/services/fuse/tests/test_inodes.py
index c5c92a9b3f15adb9bc13406b8cf215c3fef45b73..cc22f521e0b5653d8912b280c29c66c8760a89a7 100644 (file)
--- a/services/fuse/tests/test_inodes.py
+++ b/services/fuse/tests/test_inodes.py
@@ -3,11 +3,12 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 import arvados_fuse
-import mock
 import unittest
 import llfuse
 import logging
 
+from unittest import mock
+
 class InodeTests(unittest.TestCase):
 
     # The following tests call next(inodes._counter) because inode 1

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index b3bec39cc584124d42c51a7bbc292f5d492317bd..2d775c0608dfb9326a64f8e80eb05832fa90f160 100644 (file)
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -12,7 +12,6 @@ import errno
 import json
 import llfuse
 import logging
-import mock
 import os
 import subprocess
 import time
@@ -20,6 +19,8 @@ import unittest
 import tempfile
 import parameterized
 
+from unittest import mock
+
 import arvados
 import arvados_fuse as fuse
 from arvados_fuse import fusedir

diff --git a/services/fuse/tests/test_retry.py b/services/fuse/tests/test_retry.py
index 44ab5cce91a4f9d3a746b7f2f2a21151d83871a4..92081de0a077fe3ace3513839eca950b63754af8 100644 (file)
--- a/services/fuse/tests/test_retry.py
+++ b/services/fuse/tests/test_retry.py
@@ -8,7 +8,6 @@ standard_library.install_aliases()
 import arvados
 import arvados_fuse.command
 import json
-import mock
 import os
 import pycurl
 import queue
@@ -16,8 +15,9 @@ from . import run_test_server
 import tempfile
 import unittest
 
-from .integration_test import IntegrationTest
+from unittest import mock
 
+from .integration_test import IntegrationTest
 
 class KeepClientRetry(unittest.TestCase):
     origKeepClient = arvados.keep.KeepClient

diff --git a/services/fuse/tests/test_token_expiry.py b/services/fuse/tests/test_token_expiry.py
index 040db2e096252f4f538800e8175f98ed48fcd5cb..ca2228c5610cb0de4df9140535d56f139a72689f 100644 (file)
--- a/services/fuse/tests/test_token_expiry.py
+++ b/services/fuse/tests/test_token_expiry.py
@@ -7,7 +7,6 @@ import apiclient
 import arvados
 import arvados_fuse
 import logging
-import mock
 import multiprocessing
 import os
 import re
@@ -15,6 +14,8 @@ import sys
 import time
 import unittest
 
+from unittest import mock
+
 from .integration_test import IntegrationTest
 
 logger = logging.getLogger('arvados.arv-mount')

diff --git a/tools/crunchstat-summary/setup.py b/tools/crunchstat-summary/setup.py
index e1a07e204d594c08781239d0d1b39596538dc1f0..53af6455fb2ecdf2ab2401f2476fb6ce4cb02f9e 100755 (executable)
--- a/tools/crunchstat-summary/setup.py
+++ b/tools/crunchstat-summary/setup.py
@@ -36,6 +36,5 @@ setup(name='crunchstat_summary',
       ],
       python_requires="~=3.8",
       test_suite='tests',
-      tests_require=['mock>=1.0'],
       zip_safe=False,
 )

diff --git a/tools/crunchstat-summary/tests/test_examples.py b/tools/crunchstat-summary/tests/test_examples.py
index 5a20d3283f813341cc47e51b5e46231dc92b6829..7d97fd3edc474fc48b6fa7eede25134397c98c65 100644 (file)
--- a/tools/crunchstat-summary/tests/test_examples.py
+++ b/tools/crunchstat-summary/tests/test_examples.py
@@ -10,11 +10,12 @@ import glob
 import gzip
 import io
 import logging
-import mock
 import os
 import sys
 import unittest
 
+from unittest import mock
+
 from crunchstat_summary.command import UTF8Decode
 from crunchstat_summary import logger, reader