summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-05-22 22:24:45 (GMT)
committerGitHub <noreply@github.com>2020-05-22 22:24:45 (GMT)
commit0cc7becde0bfe896fd23b5cb14fedfb8f2066fca (patch)
tree0bd144cec55b12adda1e27dd27ccca75b1c6ab66
parent16d07812dd3833295cc001d19eea42eecbdb6ea5 (diff)
downloadcpython-0cc7becde0bfe896fd23b5cb14fedfb8f2066fca.zip
cpython-0cc7becde0bfe896fd23b5cb14fedfb8f2066fca.tar.gz
cpython-0cc7becde0bfe896fd23b5cb14fedfb8f2066fca.tar.bz2
bpo-40214: Fix ctypes WinDLL test with insecure flags (GH-19652)
(cherry picked from commit 9b498939009f49b8c772c89e8fc80efbfd8afcb5) Co-authored-by: Steve Dower <steve.dower@python.org>
-rw-r--r--Lib/ctypes/test/test_loading.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/ctypes/test/test_loading.py b/Lib/ctypes/test/test_loading.py
index a62044e..5c48b0d 100644
--- a/Lib/ctypes/test/test_loading.py
+++ b/Lib/ctypes/test/test_loading.py
@@ -158,11 +158,9 @@ class LoaderTest(unittest.TestCase):
# Relative path (but not just filename) should succeed
should_pass("WinDLL('./_sqlite3.dll')")
- # XXX: This test has started failing on Azure Pipelines CI. See
- # bpo-40214 for more information.
- if 0:
- # Insecure load flags should succeed
- should_pass("WinDLL('_sqlite3.dll', winmode=0)")
+ # Insecure load flags should succeed
+ # Clear the DLL directory to avoid safe search settings propagating
+ should_pass("windll.kernel32.SetDllDirectoryW(None); WinDLL('_sqlite3.dll', winmode=0)")
# Full path load without DLL_LOAD_DIR shouldn't find dependency
should_fail("WinDLL(nt._getfullpathname('_sqlite3.dll'), " +