Skip to content

bpo-36511: Fix Windows arm32 buildbot pythoninfo, scp, and ssh #13454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jun 19, 2019
Merged

bpo-36511: Fix Windows arm32 buildbot pythoninfo, scp, and ssh #13454

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1d33fe6
bpo-36511: Fix Windows arm32 buildbot pythoninfo, scp, and ssh
May 20, 2019
3aadf52
add +d to match test.bat
May 21, 2019
7f17d29
100% test pass when manually running test.bat
May 22, 2019
9aaa2c4
fix file destination
May 22, 2019
3f38d18
only skip ssl tests on Windows IoT
May 23, 2019
4e147de
Avoid mixing debug/release CRT on Windows
May 23, 2019
9819647
test for win32
May 23, 2019
365701c
propagate exit code
May 23, 2019
69c40d7
fix 2 more exit 0 calls
May 23, 2019
086a1b9
fixes for test_regrtest
May 24, 2019
042e0e9
merge upstream/master
May 24, 2019
e230795
add tools/parser for test_tools
May 24, 2019
1a1f12d
copy entire Tools directory
May 24, 2019
29601d8
skip check on Windows ARM32
May 24, 2019
786194d
restore 64-bit check in test_regrtest
May 24, 2019
cd2d5c5
merge upstream/master
Jun 11, 2019
f5c917a
Update Lib/test/test_math.py
paulmon Jun 19, 2019
e2fb14b
Update Lib/test/test_ssl.py
paulmon Jun 19, 2019
ce3dfbc
Merge remote-tracking branch 'upstream/master' into arm32_pythoninfo
Jun 19, 2019
5c355ab
fix mismatched paren
Jun 19, 2019
f1ce1bf
fix Py_DEBUG_WIN32 spelling
Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
only skip ssl tests on Windows IoT
  • Loading branch information
Paul Monson committed May 23, 2019
commit 3f38d18a5d47cb4858fdd06fa27288d1f96b4b51
7 changes: 4 additions & 3 deletions Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
ssl = support.import_module("ssl")

Py_DEBUG = hasattr(sys, 'gettotalrefcount')
Py_DEBUG_Win32_IoT = Py_DEBUG and platform.win32_is_iot()

PROTOCOLS = sorted(ssl._PROTOCOL_NAMES)
HOST = support.HOST
Expand Down Expand Up @@ -1346,7 +1347,7 @@ def test_load_verify_cadata(self):
ctx.load_verify_locations(cadata=b"broken")


@unittest.skipIf(Py_DEBUG, "Crashes on debug python builds")
@unittest.skipIf(sys.platform=='win32' and '' and Py_DEBUG_Win32_IoT, "Crashes on debug builds on Windows IoT")
def test_load_dh_params(self):
ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
ctx.load_dh_params(DHFILE)
Expand Down Expand Up @@ -1647,7 +1648,7 @@ def test_str(self):
self.assertEqual(str(e), "foo")
self.assertEqual(e.errno, 1)

@unittest.skipIf(Py_DEBUG, "Crashes on debug python builds")
@unittest.skipIf(Py_DEBUG_Win32_IoT, "Crashes on debug builds on Windows IoT")
def test_lib_reason(self):
# Test the library and reason attributes
ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
Expand Down Expand Up @@ -3828,7 +3829,7 @@ def test_compression_disabled(self):
sni_name=hostname)
self.assertIs(stats['compression'], None)

@unittest.skipIf(Py_DEBUG, "Crashes on debug python builds")
@unittest.skipIf(Py_DEBUG_Win32_IoT, "Crashes on debug builds on Windows IoT")
def test_dh_params(self):
# Check we can get a connection with ephemeral Diffie-Hellman
client_context, server_context, hostname = testing_context()
Expand Down
1 change: 1 addition & 0 deletions Tools/buildbot/remoteDeploy.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ echo SSH = %SSH%
echo SCP = %SCP%
if "%PYTHON_SOURCE%"=="" (set PYTHON_SOURCE=%here%..\..\)
if "%REMOTE_PYTHON_DIR%"=="" (set REMOTE_PYTHON_DIR=C:\python\)
if NOT "%REMOTE_PYTHON_DIR:~-1,1%"=="\" (set REMOTE_PYTHON_DIR=%REMOTE_PYTHON_DIR%\)
%SSH% %SSH_SERVER% "if EXIST %REMOTE_PYTHON_DIR% (rd %REMOTE_PYTHON_DIR% /s/q)"
%SSH% %SSH_SERVER% "md %REMOTE_PYTHON_DIR%PCBuild\arm32"
%SSH% %SSH_SERVER% "md %REMOTE_PYTHON_DIR%temp"
Expand Down
5 changes: 4 additions & 1 deletion Tools/buildbot/remotePythonInfo.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ setlocal
set here=%~dp0
set arm32_ssh=
set suffix=_d
if "%REMOTE_PYTHON_DIR%"=="" (set REMOTE_PYTHON_DIR=C:\python\)
if NOT "%REMOTE_PYTHON_DIR:~-1,1%"=="\" (set REMOTE_PYTHON_DIR=%REMOTE_PYTHON_DIR%\)

:CheckOpts
if "%1"=="-arm32" (set arm32_ssh=true) & (set prefix=c:\python\pcbuild\arm32) & shift & goto CheckOpts
if "%1"=="-arm32" (set arm32_ssh=true) & (set prefix=%REMOTE_PYTHON_DIR%pcbuild\arm32) & shift & goto CheckOpts
if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts
if "%1"=="+d" (set suffix=) & shift & goto CheckOpts
if NOT "%1"=="" (echo unrecognized option %1) & goto Arm32SshHelp
Expand Down
1 change: 1 addition & 0 deletions Tools/buildbot/test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ set dashU=-unetwork,decimal,subprocess,urlfetch,tzdata
if "%SSH_SERVER%"=="" goto :Arm32SshHelp
if "%PYTHON_SOURCE%"=="" (set PYTHON_SOURCE=%here%..\..\)
if "%REMOTE_PYTHON_DIR%"=="" (set REMOTE_PYTHON_DIR=C:\python\)
if NOT "%REMOTE_PYTHON_DIR:~-1,1%"=="\" (set REMOTE_PYTHON_DIR=%REMOTE_PYTHON_DIR%\)
if "%SSH%"=="" if EXIST %WINDIR%\System32\OpenSSH\ssh.exe (set SSH=%WINDIR%\System32\OpenSSH\ssh.exe)
set TEMP_ARGS=--temp %REMOTE_PYTHON_DIR%temp

Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy