[Refactor][NFC] Vendor in TestCase and other testing helpers for CUDA-specific changes

numba_cuda/numba/cuda/testing.py

@@ -7,7 +7,7 @@
 from numba.cuda.cudadrv import driver, devices, libs
 from numba.cuda.dispatcher import CUDADispatcher
 from numba.core import config
-from numba.tests.support import TestCase
+from numba.cuda.tests.support import TestCase
 from pathlib import Path
 from typing import Union
 from io import StringIO

numba_cuda/numba/cuda/tests/cudadrv/test_cuda_ndarray.py

@@ -4,7 +4,7 @@
 from numba import cuda
 from numba.cuda.testing import unittest, CUDATestCase
 from numba.cuda.testing import skip_on_cudasim
-from numba.tests.support import IS_NUMPY_2
+from numba.cuda.tests.support import IS_NUMPY_2
 
 
 class TestCudaNDArray(CUDATestCase):

numba_cuda/numba/cuda/tests/cudadrv/test_deallocations.py

@@ -9,7 +9,7 @@
     skip_if_external_memmgr,
     CUDATestCase,
 )
-from numba.tests.support import captured_stderr
+from numba.cuda.tests.support import captured_stderr
 from numba.core import config
 
 

numba_cuda/numba/cuda/tests/cudadrv/test_detect.py

@@ -9,7 +9,7 @@
     skip_on_cudasim,
     skip_under_cuda_memcheck,
 )
-from numba.tests.support import captured_stdout
+from numba.cuda.tests.support import captured_stdout
 
 
 class TestCudaDetect(CUDATestCase):

numba_cuda/numba/cuda/tests/cudadrv/test_emm_plugins.py

@@ -5,7 +5,7 @@
 from numba import cuda
 from numba.core import config
 from numba.cuda.testing import unittest, CUDATestCase, skip_on_cudasim
-from numba.tests.support import linux_only
+from numba.cuda.tests.support import linux_only
 
 if not config.ENABLE_CUDASIM:
 

numba_cuda/numba/cuda/tests/cudadrv/test_linker.py

@@ -6,7 +6,7 @@
 from numba.cuda.testing import CUDATestCase, test_data_dir
 from numba.cuda.cudadrv.driver import CudaAPIError, _Linker, LinkerError
 from numba.cuda import require_context
-from numba.tests.support import ignore_internal_warnings
+from numba.cuda.tests.support import ignore_internal_warnings
 from numba import cuda, void, float64, int64, int32, typeof, float32
 from numba.cuda.cudadrv.error import NvrtcError
 

numba_cuda/numba/cuda/tests/cudadrv/test_managed_alloc.py

@@ -4,7 +4,7 @@
 from numba import cuda
 from numba.cuda.testing import unittest, ContextResettingTestCase
 from numba.cuda.testing import skip_on_cudasim, skip_on_arm
-from numba.tests.support import linux_only
+from numba.cuda.tests.support import linux_only
 
 
 @skip_on_cudasim("CUDA Driver API unsupported in the simulator")

numba_cuda/numba/cuda/tests/cudadrv/test_mvc.py

@@ -6,7 +6,7 @@
     skip_under_cuda_memcheck,
     skip_if_mvc_libraries_unavailable,
 )
-from numba.tests.support import linux_only
+from numba.cuda.tests.support import linux_only
 
 
 def child_test():

numba_cuda/numba/cuda/tests/cudadrv/test_ptds.py

@@ -7,7 +7,7 @@
     skip_with_cuda_python,
     skip_under_cuda_memcheck,
 )
-from numba.tests.support import linux_only
+from numba.cuda.tests.support import linux_only
 
 
 def child_test():

numba_cuda/numba/cuda/tests/cudapy/test_caching.py

@@ -3,6 +3,9 @@
 import shutil
 import unittest
 import warnings
+import sys
+import stat
+import subprocess
 
 from numba import cuda
 from numba.core.errors import NumbaWarning
@@ -14,12 +17,152 @@
     skip_if_mvc_enabled,
     test_data_dir,
 )
-from numba.tests.test_caching import (
-    DispatcherCacheUsecasesTest,
-    skip_bad_access,
+from numba.cuda.tests.support import (
+    TestCase,
+    temp_directory,
+    import_dynamic,
 )
 
 
+class BaseCacheTest(TestCase):
+    # The source file that will be copied
+    usecases_file = None
+    # Make sure this doesn't conflict with another module
+    modname = None
+
+    def setUp(self):
+        self.tempdir = temp_directory("test_cache")
+        sys.path.insert(0, self.tempdir)
+        self.modfile = os.path.join(self.tempdir, self.modname + ".py")
+        self.cache_dir = os.path.join(self.tempdir, "__pycache__")
+        shutil.copy(self.usecases_file, self.modfile)
+        os.chmod(self.modfile, stat.S_IREAD | stat.S_IWRITE)
+        self.maxDiff = None
+
+    def tearDown(self):
+        sys.modules.pop(self.modname, None)
+        sys.path.remove(self.tempdir)
+
+    def import_module(self):
+        # Import a fresh version of the test module.  All jitted functions
+        # in the test module will start anew and load overloads from
+        # the on-disk cache if possible.
+        old = sys.modules.pop(self.modname, None)
+        if old is not None:
+            # Make sure cached bytecode is removed
+            cached = [old.__cached__]
+            for fn in cached:
+                try:
+                    os.unlink(fn)
+                except FileNotFoundError:
+                    pass
+        mod = import_dynamic(self.modname)
+        self.assertEqual(mod.__file__.rstrip("co"), self.modfile)
+        return mod
+
+    def cache_contents(self):
+        try:
+            return [
+                fn
+                for fn in os.listdir(self.cache_dir)
+                if not fn.endswith((".pyc", ".pyo"))
+            ]
+        except FileNotFoundError:
+            return []
+
+    def get_cache_mtimes(self):
+        return dict(
+            (fn, os.path.getmtime(os.path.join(self.cache_dir, fn)))
+            for fn in sorted(self.cache_contents())
+        )
+
+    def check_pycache(self, n):
+        c = self.cache_contents()
+        self.assertEqual(len(c), n, c)
+
+    def dummy_test(self):
+        pass
+
+
+class DispatcherCacheUsecasesTest(BaseCacheTest):
+    here = os.path.dirname(__file__)
+    usecases_file = os.path.join(here, "cache_usecases.py")
+    modname = "dispatcher_caching_test_fodder"
+
+    def run_in_separate_process(self, *, envvars={}):
+        # Cached functions can be run from a distinct process.
+        # Also stresses issue #1603: uncached function calling cached function
+        # shouldn't fail compiling.
+        code = """if 1:
+            import sys
+
+            sys.path.insert(0, %(tempdir)r)
+            mod = __import__(%(modname)r)
+            mod.self_test()
+            """ % dict(tempdir=self.tempdir, modname=self.modname)
+
+        subp_env = os.environ.copy()
+        subp_env.update(envvars)
+        popen = subprocess.Popen(
+            [sys.executable, "-c", code],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            env=subp_env,
+        )
+        out, err = popen.communicate()
+        if popen.returncode != 0:
+            raise AssertionError(
+                "process failed with code %s: \n"
+                "stdout follows\n%s\n"
+                "stderr follows\n%s\n"
+                % (popen.returncode, out.decode(), err.decode()),
+            )
+
+    def check_hits(self, func, hits, misses=None):
+        st = func.stats
+        self.assertEqual(sum(st.cache_hits.values()), hits, st.cache_hits)
+        if misses is not None:
+            self.assertEqual(
+                sum(st.cache_misses.values()), misses, st.cache_misses
+            )
+
+
+def check_access_is_preventable():
+    # This exists to check whether it is possible to prevent access to
+    # a file/directory through the use of `chmod 500`. If a user has
+    # elevated rights (e.g. root) then writes are likely to be possible
+    # anyway. Tests that require functioning access prevention are
+    # therefore skipped based on the result of this check.
+    tempdir = temp_directory("test_cache")
+    test_dir = os.path.join(tempdir, "writable_test")
+    os.mkdir(test_dir)
+    # check a write is possible
+    with open(os.path.join(test_dir, "write_ok"), "wt") as f:
+        f.write("check1")
+    # now forbid access
+    os.chmod(test_dir, 0o500)
+    try:
+        with open(os.path.join(test_dir, "write_forbidden"), "wt") as f:
+            f.write("check2")
+        # access prevention is not possible
+        return False
+    except PermissionError:
+        # Check that the cause of the exception is due to access/permission
+        # as per
+        # https://github.com/conda/conda/blob/4.5.0/conda/gateways/disk/permissions.py#L35-L37  # noqa: E501
+        # errno reports access/perm fail so access prevention via
+        # `chmod 500` works for this user.
+        return True
+    finally:
+        os.chmod(test_dir, 0o775)
+        shutil.rmtree(test_dir)
+
+
+_access_preventable = check_access_is_preventable()
+_access_msg = "Cannot create a directory to which writes are preventable"
+skip_bad_access = unittest.skipUnless(_access_preventable, _access_msg)
+
+
 @skip_on_cudasim("Simulator does not implement caching")
 class CUDACachingTest(DispatcherCacheUsecasesTest):
     here = os.path.dirname(__file__)

numba_cuda/numba/cuda/tests/cudapy/test_cffi.py

@@ -7,7 +7,7 @@
     unittest,
     CUDATestCase,
 )
-from numba.tests.support import skip_unless_cffi
+from numba.cuda.tests.support import skip_unless_cffi
 
 
 @skip_unless_cffi

numba_cuda/numba/cuda/tests/cudapy/test_cuda_array_interface.py

@@ -4,7 +4,7 @@
 from numba import cuda
 from numba.cuda.testing import unittest, ContextResettingTestCase, ForeignArray
 from numba.cuda.testing import skip_on_cudasim, skip_if_external_memmgr
-from numba.tests.support import linux_only, override_config
+from numba.cuda.tests.support import linux_only, override_config
 from unittest.mock import call, patch
 
 

numba_cuda/numba/cuda/tests/cudapy/test_cuda_jit_no_types.py

@@ -1,7 +1,7 @@
 from numba import cuda
 import numpy as np
 from numba.cuda.testing import CUDATestCase
-from numba.tests.support import override_config
+from numba.cuda.tests.support import override_config
 import unittest
 
 

numba_cuda/numba/cuda/tests/cudapy/test_debug.py

@@ -2,7 +2,7 @@
 
 from numba.core.utils import PYVERSION
 from numba.cuda.testing import skip_on_cudasim, CUDATestCase
-from numba.tests.support import (
+from numba.cuda.tests.support import (
     override_config,
     captured_stderr,
     captured_stdout,

numba_cuda/numba/cuda/tests/cudapy/test_debuginfo.py

@@ -1,4 +1,4 @@
-from numba.tests.support import override_config, captured_stdout
+from numba.cuda.tests.support import override_config, captured_stdout
 from numba.cuda.testing import skip_on_cudasim
 from numba import cuda
 from numba.core import types

numba_cuda/numba/cuda/tests/cudapy/test_device_func.py

@@ -12,7 +12,7 @@
 )
 from numba import cuda, jit, float32, int32, types
 from numba.core.errors import TypingError
-from numba.tests.support import skip_unless_cffi
+from numba.cuda.tests.support import skip_unless_cffi
 from types import ModuleType
 
 

numba_cuda/numba/cuda/tests/cudapy/test_gufunc.py

@@ -8,7 +8,7 @@
 import unittest
 import warnings
 from numba.core.errors import NumbaPerformanceWarning, TypingError
-from numba.tests.support import override_config
+from numba.cuda.tests.support import override_config
 
 
 def _get_matmulcore_gufunc(dtype=float32):

numba_cuda/numba/cuda/tests/cudapy/test_ipc.py

@@ -14,7 +14,7 @@
     ContextResettingTestCase,
     ForeignArray,
 )
-from numba.tests.support import linux_only, windows_only
+from numba.cuda.tests.support import linux_only, windows_only
 import unittest
 
 

numba_cuda/numba/cuda/tests/cudapy/test_lineinfo.py

@@ -1,7 +1,7 @@
 from numba import cuda, float32, int32
 from numba.core.errors import NumbaInvalidConfigWarning
 from numba.cuda.testing import CUDATestCase, skip_on_cudasim
-from numba.tests.support import ignore_internal_warnings
+from numba.cuda.tests.support import ignore_internal_warnings
 import re
 import unittest
 import warnings

numba_cuda/numba/cuda/tests/cudapy/test_ufuncs.py

@@ -3,7 +3,7 @@
 import unittest
 
 from numba import config, cuda, types
-from numba.tests.support import TestCase
+from numba.cuda.tests.support import TestCase
 from numba.tests.test_ufuncs import BasicUFuncTest
 
 

numba_cuda/numba/cuda/tests/cudapy/test_warning.py

@@ -6,7 +6,11 @@
     CUDATestCase,
     skip_on_cudasim,
 )
-from numba.tests.support import linux_only, override_config, run_in_subprocess
+from numba.cuda.tests.support import (
+    linux_only,
+    override_config,
+    run_in_subprocess,
+)
 from numba.core.errors import NumbaPerformanceWarning
 from numba.core import config
 import warnings

numba_cuda/numba/cuda/tests/doc_examples/test_cpointer.py

@@ -1,7 +1,7 @@
 import unittest
 
 from numba.cuda.testing import CUDATestCase, skip_on_cudasim
-from numba.tests.support import captured_stdout
+from numba.cuda.tests.support import captured_stdout
 
 
 @skip_on_cudasim("cudasim doesn't support cuda import at non-top-level")

numba_cuda/numba/cuda/tests/doc_examples/test_cpu_gpu_compat.py

@@ -1,7 +1,7 @@
 import unittest
 
 from numba.cuda.testing import CUDATestCase, skip_on_cudasim
-from numba.tests.support import captured_stdout
+from numba.cuda.tests.support import captured_stdout
 import numpy as np
 
 

numba_cuda/numba/cuda/tests/doc_examples/test_ffi.py

@@ -3,7 +3,7 @@
 
 import unittest
 from numba.cuda.testing import CUDATestCase, skip_on_cudasim
-from numba.tests.support import skip_unless_cffi, override_config
+from numba.cuda.tests.support import skip_unless_cffi, override_config
 
 
 @skip_unless_cffi

numba_cuda/numba/cuda/tests/doc_examples/test_laplace.py

@@ -7,7 +7,7 @@
     skip_unless_cc_60,
     skip_if_mvc_enabled,
 )
-from numba.tests.support import captured_stdout
+from numba.cuda.tests.support import captured_stdout
 
 
 @skip_if_cudadevrt_missing

numba_cuda/numba/cuda/tests/doc_examples/test_matmul.py

@@ -9,7 +9,7 @@
 
 import unittest
 from numba.cuda.testing import CUDATestCase, skip_on_cudasim
-from numba.tests.support import captured_stdout
+from numba.cuda.tests.support import captured_stdout
 
 
 @skip_on_cudasim("cudasim doesn't support cuda import at non-top-level")