Add tests for patches from URL

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/test_patched_pip.py

@@ -42,8 +42,12 @@
 import subprocess
 import sys
 import tempfile
+import threading
 import unittest
+from http.server import HTTPServer, SimpleHTTPRequestHandler
 from pathlib import Path
+from urllib.parse import urljoin
+from urllib.request import pathname2url
 
 SETUP_PY_TEMPLATE = '''
 from setuptools import setup, find_packages
@@ -145,27 +149,37 @@ def add_package_to_index(self, name, version, dist_type):
             package = self.build_package(name, version)[dist_type]
             shutil.copy(package, self.index_dir)
 
-        def run_venv_pip_install(self, package, extra_env=None):
+        def run_venv_pip_install(self, package, extra_env=None, assert_stderr_matches=None):
             env = self.pip_env.copy()
             if extra_env:
                 env.update(extra_env)
-            out = subprocess.check_output([
-                self.venv_python,
-                '--experimental-options', '--python.EnableDebuggingBuiltins=true',
-                '-m', 'pip', 'install', '--force-reinstall',
-                '--find-links', self.index_dir, '--no-index', '--no-cache-dir',
-                package],
-                env=env, universal_newlines=True)
-            assert 'Applying GraalPy patch failed for' not in out
-            return re.findall(r'Successfully installed (\S+)', out)
+            proc = subprocess.run(
+                [
+                    str(self.venv_dir / 'bin' / 'pip'),
+                    '--isolated',
+                    'install',
+                    '--force-reinstall',
+                    '--find-links', self.index_dir,
+                    '--no-index',
+                    '--no-cache-dir',
+                    package,
+                ],
+                check=True,
+                capture_output=True,
+                env=env,
+                universal_newlines=True,
+            )
+            print(proc.stderr)
+            assert 'Applying GraalPy patch failed for' not in proc.stderr
+            if assert_stderr_matches:
+                assert re.search(assert_stderr_matches, proc.stderr), \
+                    f"Didn't match expected stderr.\nExpected (regex): {assert_stderr_matches}\nActual:{proc.stderr}"
+            return re.findall(r'Successfully installed (\S+)', proc.stdout)
 
         def run_test_fun(self):
             code = "import patched_package; print(patched_package.test_fun())"
             return subprocess.check_output([self.venv_python, '-c', code], universal_newlines=True).strip()
 
-        def test_pip_launcher(self):
-            subprocess.check_output([str(self.venv_dir / 'bin' / 'pip'), 'install', '--help'])
-
         def test_wheel_unpatched_version(self):
             self.add_package_to_index('foo', '1.0.0', 'wheel')
             self.prepare_config('foo', [{
@@ -386,3 +400,63 @@ def test_name_with_dashes(self):
             }])
             assert self.run_venv_pip_install('package-with-dashes') == ['package-with-dashes-1.0.0']
             assert self.run_test_fun() == "Patched"
+
+        def check_installing_with_patch_repo(self, url_or_path: str, *, graalpy_version=None, should_be_skipped=False,
+                                             assert_stderr_matches=None):
+            self.pip_env['PIP_GRAALPY_PATCHES_URL'] = url_or_path
+            if graalpy_version:
+                self.pip_env['TEST_PIP_GRAALPY_VERSION'] = graalpy_version
+            self.add_package_to_index('foo', '1.1.0', 'wheel')
+            self.prepare_config('foo', [{'patch': 'foo.patch'}])
+            assert self.run_venv_pip_install('foo', assert_stderr_matches=assert_stderr_matches) == ['foo-1.1.0']
+            assert self.run_test_fun() == ("Unpatched" if should_be_skipped else "Patched")
+
+        def test_broken_patches_path(self):
+            self.check_installing_with_patch_repo(
+                '/tmp/not-there',
+                should_be_skipped=True,
+                assert_stderr_matches="WARNING: Failed to load GraalPy patch repository",
+            )
+
+        def test_patches_file_url(self):
+            self.check_installing_with_patch_repo(urljoin('file:', pathname2url(str(self.patch_dir.absolute()))))
+
+        def test_patches_http_url(self):
+            patch_dir = self.patch_dir
+
+            class Handler(SimpleHTTPRequestHandler):
+                def __init__(self, *args, **kwargs):
+                    super().__init__(*args, directory=str(patch_dir), **kwargs)
+
+            try:
+                with HTTPServer(('localhost', 0), Handler) as server:
+                    thread = threading.Thread(target=server.serve_forever)
+                    thread.start()
+                    try:
+                        self.check_installing_with_patch_repo(f'http://localhost:{server.server_port}')
+                    finally:
+                        server.shutdown()
+            finally:
+                thread.join()
+
+        def test_patches_repo_version_resolution_exact(self):
+            patch_dir_parent = self.patch_dir
+            self.patch_dir = patch_dir_parent / '1.3.2'
+            self.patch_dir.mkdir()
+            self.check_installing_with_patch_repo(str(patch_dir_parent / '<version>'), graalpy_version='1.3.2')
+
+        def test_patches_repo_version_resolution_major(self):
+            patch_dir_parent = self.patch_dir
+            self.patch_dir = patch_dir_parent / '1.3'
+            self.patch_dir.mkdir()
+            self.check_installing_with_patch_repo(str(patch_dir_parent / '<version>'), graalpy_version='1.3.2')
+
+        def test_patches_repo_version_resolution_dev(self):
+            patch_dir_parent = self.patch_dir
+            self.patch_dir = patch_dir_parent / '1.3.2-dev'
+            self.patch_dir.mkdir()
+            self.check_installing_with_patch_repo(
+                str(patch_dir_parent / '<version>'),
+                graalpy_version='1.3.2-dev',
+                should_be_skipped=True,
+            )