Skip to content

Commit 9627f33

Browse files
committed
Remove tests for legacy patch structure
1 parent 8ff087d commit 9627f33

File tree

9 files changed

+0
-143
lines changed

9 files changed

+0
-143
lines changed

graalpython/com.oracle.graal.python.test/src/tests/patched_package/patches/patched_package/whl/patched_package-1.1.0.dir

Lines changed: 0 additions & 1 deletion
This file was deleted.

graalpython/com.oracle.graal.python.test/src/tests/patched_package/patches/patched_package/whl/patched_package-1.1.0.patch

Lines changed: 0 additions & 6 deletions
This file was deleted.

graalpython/com.oracle.graal.python.test/src/tests/patched_package/setup.py

Lines changed: 0 additions & 58 deletions
This file was deleted.

graalpython/com.oracle.graal.python.test/src/tests/patched_package/src/patched_package/__init__.py

Lines changed: 0 additions & 41 deletions
This file was deleted.

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

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,6 @@ def test_fun():
7373

7474
if sys.implementation.name == "graalpy":
7575

76-
PKG_SRC_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'patched_package')
77-
DIST_DIR = os.path.join(PKG_SRC_DIR, 'dist')
78-
BDIST_1_0_0 = os.path.join(DIST_DIR, 'patched_package-1.0.0-py3-none-any.whl')
79-
BDIST_1_1_0 = os.path.join(DIST_DIR, 'patched_package-1.1.0-py3-none-any.whl')
80-
SDIST_1_0_0 = os.path.join(DIST_DIR, 'patched_package-1.0.0.tar.gz')
81-
SDIST_1_1_0 = os.path.join(DIST_DIR, 'patched_package-1.1.0.tar.gz')
82-
# TODO simplify legacy structure after ginstall is removed
83-
PATCHES_DIRS = os.path.join(PKG_SRC_DIR, 'patches')
84-
85-
8676
class PipPatchingTest(unittest.TestCase):
8777
"""
8878
Checks that our patched pip correctly patches or does not patch a package
@@ -398,30 +388,3 @@ def test_name_with_dashes(self):
398388
}])
399389
assert self.run_venv_pip_install('package-with-dashes') == ['package-with-dashes-1.0.0']
400390
assert self.run_test_fun() == "Patched"
401-
402-
# Tests for legacy patch structure
403-
def test_wheel_unpatched_version_legacy(self):
404-
self.pip_env['PIPLOADER_PATCHES_BASE_DIRS'] = PATCHES_DIRS
405-
self.run_venv_pip_install(BDIST_1_0_0)
406-
assert self.run_test_fun() == "Unpatched"
407-
408-
def test_wheel_patched_version_legacy(self):
409-
self.pip_env['PIPLOADER_PATCHES_BASE_DIRS'] = PATCHES_DIRS
410-
self.run_venv_pip_install(BDIST_1_1_0)
411-
assert self.run_test_fun() == "Patched"
412-
413-
def test_sdist_unpatched_version_legacy(self):
414-
self.pip_env['PIPLOADER_PATCHES_BASE_DIRS'] = PATCHES_DIRS
415-
# Note: PKG_VERSION is used by setup.py
416-
self.run_venv_pip_install(SDIST_1_0_0, extra_env={'PKG_VERSION': '1.0.0'})
417-
assert self.run_test_fun() == "Unpatched"
418-
419-
def test_sdist_patched_version_legacy(self):
420-
self.pip_env['PIPLOADER_PATCHES_BASE_DIRS'] = PATCHES_DIRS
421-
self.run_venv_pip_install(SDIST_1_1_0, extra_env={'PKG_VERSION': '1.1.0'})
422-
assert self.run_test_fun() == "Patched"
423-
424-
def test_sdist_patched_with_wheel_patch_legacy(self):
425-
self.pip_env['PIPLOADER_PATCHES_BASE_DIRS'] = PATCHES_DIRS
426-
self.run_venv_pip_install(SDIST_1_1_0, extra_env={'PKG_VERSION': '1.1.0'})
427-
assert self.run_test_fun() == "Patched"

0 commit comments

Comments
 (0)