From dff3611d16420c2374935f5c859a8a2070e0d769 Mon Sep 17 00:00:00 2001 From: rocky Date: Sun, 26 Jan 2020 11:52:35 -0500 Subject: [PATCH] Tidy runtests.sh more. --- test/stdlib/2.6-exclude.sh | 15 ++++++++ test/stdlib/2.7-exclude.sh | 14 +++++++ test/stdlib/3.2-exclude.sh | 7 ++++ test/stdlib/3.3-exclude.sh | 10 +++++ test/stdlib/3.4-exclude.sh | 8 ++++ test/stdlib/3.5-exclude.sh | 16 ++++++++ test/stdlib/3.6-exclude.sh | 6 +++ test/stdlib/3.7-exclude.sh | 7 ++++ test/stdlib/runtests.sh | 79 -------------------------------------- 9 files changed, 83 insertions(+), 79 deletions(-) diff --git a/test/stdlib/2.6-exclude.sh b/test/stdlib/2.6-exclude.sh index 6b458b2ca..f373c2b3d 100644 --- a/test/stdlib/2.6-exclude.sh +++ b/test/stdlib/2.6-exclude.sh @@ -84,3 +84,18 @@ SKIP_TESTS=( # .pyenv/versions/2.6.9/lib/python2.6/pyclbr.pyc ) # About 305 unit-test files in about 12 minutes + +if (( batch )) ; then + # Fails in crontab environment? + # Figure out what's up here + SKIP_TESTS[test_aifc.py]=1 + SKIP_TESTS[test_array.py]=1 + + # SyntaxError: Non-ASCII character '\xdd' in file test_base64.py on line 153, but no encoding declared; see http://www.python.org/peps/pep-0263.html for details + SKIP_TESTS[test_base64.py]=1 + SKIP_TESTS[test_decimal.py]=1 # Might be a POWER math thing + + # output indicates expected == output, but this fails anyway. + # Maybe the underlying encoding is subtlely different so it + # looks the same? +fi diff --git a/test/stdlib/2.7-exclude.sh b/test/stdlib/2.7-exclude.sh index a17bc8a10..7f6013c8f 100644 --- a/test/stdlib/2.7-exclude.sh +++ b/test/stdlib/2.7-exclude.sh @@ -33,3 +33,17 @@ SKIP_TESTS=( [test_zipimport.py]=1 # ) # 334 unit-test files in about 15 minutes + +if (( batch )) ; then + # Fails in crontab environment? + # Figure out what's up here + SKIP_TESTS[test_array.py]=1 + SKIP_TESTS[test_ast.py]=1 + SKIP_TESTS[test_audioop.py]=1 + SKIP_TESTS[test_doctest2.py]=1 # a POWER thing? + SKIP_TESTS[test_httplib.py]=1 # Ok, but POWER has problems with this + SKIP_TESTS[test_pdb.py]=1 # Ok, but POWER has problems with this + + # SyntaxError: Non-ASCII character '\xdd' in file test_base64.py on line 153, but no encoding declared; see http://www.python.org/peps/pep-0263.html for details + SKIP_TESTS[test_base64.py]=1 +fi diff --git a/test/stdlib/3.2-exclude.sh b/test/stdlib/3.2-exclude.sh index 5e2b554cb..492691719 100644 --- a/test/stdlib/3.2-exclude.sh +++ b/test/stdlib/3.2-exclude.sh @@ -39,3 +39,10 @@ SKIP_TESTS=( [test_zipfile64.py]=1 # Too long to run ) + +if (( batch )) ; then + # Fails in crontab environment? + # Figure out what's up here + SKIP_TESTS[test_exception_variations.py]=1 + SKIP_TESTS[test_quopri.py]=1 +fi diff --git a/test/stdlib/3.3-exclude.sh b/test/stdlib/3.3-exclude.sh index 0e2ba5100..3c4361955 100644 --- a/test/stdlib/3.3-exclude.sh +++ b/test/stdlib/3.3-exclude.sh @@ -68,3 +68,13 @@ SKIP_TESTS=( [test_zipfile64.py]=1 # Too long to run ) # About 300 unit-test files in about 20 minutes + +if (( batch )) ; then + SKIP_TESTS[test_ftplib.py]=1 # Runs too long on POWER; over 15 seconds + SKIP_TESTS[test_idle.py]=1 # No tk + SKIP_TESTS[test_pep352.py]=1 # UnicodeDecodeError may be funny on weird environments + SKIP_TESTS[test_pep380.py]=1 # test_delegating_generators_claim_to_be_running ? + # Fails in crontab environment? + # Figure out what's up here + # SKIP_TESTS[test_exception_variations.py]=1 +fi diff --git a/test/stdlib/3.4-exclude.sh b/test/stdlib/3.4-exclude.sh index 2d398f6b1..1b713b3ab 100644 --- a/test/stdlib/3.4-exclude.sh +++ b/test/stdlib/3.4-exclude.sh @@ -69,3 +69,11 @@ SKIP_TESTS=( [test_zlib.py]=1 ) # 304 unit-test file in about 20 minutes + +if (( batch )) ; then + # Fails in crontab environment? + # Figure out what's up here + SKIP_TESTS[test_exception_variations.py]=1 + SKIP_TESTS[test_mailbox.py]=1 # Takes to long on POWER; over 15 secs + SKIP_TESTS[test_quopri.py]=1 +fi diff --git a/test/stdlib/3.5-exclude.sh b/test/stdlib/3.5-exclude.sh index 52f1d30de..18a680a5c 100644 --- a/test/stdlib/3.5-exclude.sh +++ b/test/stdlib/3.5-exclude.sh @@ -136,3 +136,19 @@ SKIP_TESTS=( [test_zlib.py]=1 ) # About 260 unit-test in about 16 minutes + +if (( batch )) ; then + # Fails in crontab environment? + # Figure out what's up here + SKIP_TESTS[test_bisect.py]=1 + SKIP_TESTS[test_buffer.py]=1 # too long + SKIP_TESTS[test_compileall.py]=1 # Something weird on POWER + SKIP_TESTS[test_codeccallbacks.py]=1 # Something differenet in locale? + SKIP_TESTS[test_distutils.py]=1 + + SKIP_TESTS[test_exception_variations.py]=1 + SKIP_TESTS[test_quopri.py]=1 + SKIP_TESTS[test_ioctl.py]=1 # it fails on its own + SKIP_TESTS[test_tarfile.py]=1 # too long to run on POWER 15 secs + SKIP_TESTS[test_venv.py]=1 # takes too long 11 seconds +fi diff --git a/test/stdlib/3.6-exclude.sh b/test/stdlib/3.6-exclude.sh index 3d6edff73..f9559c5b3 100644 --- a/test/stdlib/3.6-exclude.sh +++ b/test/stdlib/3.6-exclude.sh @@ -194,3 +194,9 @@ SKIP_TESTS=( [test_zlib.py]=1 ) # 236 unit-test files in about 13 minutes + +if (( batch )) ; then + SKIP_TESTS[test_codeccallbacks.py]=1 + # locale on test machine is probably customized + SKIP_TESTS[test__locale.py]=1 +fi diff --git a/test/stdlib/3.7-exclude.sh b/test/stdlib/3.7-exclude.sh index 93c62e0c2..a60fc4a83 100644 --- a/test/stdlib/3.7-exclude.sh +++ b/test/stdlib/3.7-exclude.sh @@ -127,3 +127,10 @@ SKIP_TESTS=( [test_zipfile64.py]=1 # Too long to run ) # 278 unit-test files in about 15 minutes + +if (( batch )) ; then + SKIP_TESTS[test_distutils.py]=1 + SKIP_TESTS[test_fileio.py]=1 + SKIP_TESTS[test_gc.py]=1 + SKIP_TESTS[test_zipimport_support.py]=1 +fi diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh index e8119b0e2..65c56cd6f 100755 --- a/test/stdlib/runtests.sh +++ b/test/stdlib/runtests.sh @@ -71,37 +71,9 @@ case $PYVERSION in ;; 2.6) . ./2.6-exclude.sh - if (( batch )) ; then - # Fails in crontab environment? - # Figure out what's up here - SKIP_TESTS[test_aifc.py]=1 - SKIP_TESTS[test_array.py]=1 - - # SyntaxError: Non-ASCII character '\xdd' in file test_base64.py on line 153, but no encoding declared; see http://www.python.org/peps/pep-0263.html for details - SKIP_TESTS[test_base64.py]=1 - SKIP_TESTS[test_decimal.py]=1 # Might be a POWER math thing - - # output indicates expected == output, but this fails anyway. - # Maybe the underlying encoding is subtlely different so it - # looks the same? - fi ;; 2.7) . ./2.7-exclude.sh - # About 335 unit-test remaining files run in about 20 minutes and 11 seconds - if (( batch )) ; then - # Fails in crontab environment? - # Figure out what's up here - SKIP_TESTS[test_array.py]=1 - SKIP_TESTS[test_ast.py]=1 - SKIP_TESTS[test_audioop.py]=1 - SKIP_TESTS[test_doctest2.py]=1 # a POWER thing? - SKIP_TESTS[test_httplib.py]=1 # Ok, but POWER has problems with this - SKIP_TESTS[test_pdb.py]=1 # Ok, but POWER has problems with this - - # SyntaxError: Non-ASCII character '\xdd' in file test_base64.py on line 153, but no encoding declared; see http://www.python.org/peps/pep-0263.html for details - SKIP_TESTS[test_base64.py]=1 - fi ;; 3.0) SKIP_TESTS=( @@ -135,72 +107,21 @@ case $PYVERSION in ;; 3.2) . ./3.2-exclude.sh - if (( batch )) ; then - # Fails in crontab environment? - # Figure out what's up here - SKIP_TESTS[test_exception_variations.py]=1 - SKIP_TESTS[test_quopri.py]=1 - fi ;; - 3.3) . ./3.3-exclude.sh - if (( batch )) ; then - SKIP_TESTS[test_ftplib.py]=1 # Runs too long on POWER; over 15 seconds - SKIP_TESTS[test_idle.py]=1 # No tk - SKIP_TESTS[test_pep352.py]=1 # UnicodeDecodeError may be funny on weird environments - SKIP_TESTS[test_pep380.py]=1 # test_delegating_generators_claim_to_be_running ? - # Fails in crontab environment? - # Figure out what's up here - # SKIP_TESTS[test_exception_variations.py]=1 - fi ;; - 3.4) . ./3.4-exclude.sh - if (( batch )) ; then - # Fails in crontab environment? - # Figure out what's up here - SKIP_TESTS[test_exception_variations.py]=1 - SKIP_TESTS[test_mailbox.py]=1 # Takes to long on POWER; over 15 secs - SKIP_TESTS[test_quopri.py]=1 - fi ;; 3.5) . ./3.5-exclude.sh - # About 240 remaining which can be done in about 10 minutes - if (( batch )) ; then - # Fails in crontab environment? - # Figure out what's up here - SKIP_TESTS[test_bisect.py]=1 - SKIP_TESTS[test_buffer.py]=1 # too long - SKIP_TESTS[test_compileall.py]=1 # Something weird on POWER - SKIP_TESTS[test_codeccallbacks.py]=1 # Something differenet in locale? - SKIP_TESTS[test_distutils.py]=1 - - SKIP_TESTS[test_exception_variations.py]=1 - SKIP_TESTS[test_quopri.py]=1 - SKIP_TESTS[test_ioctl.py]=1 # it fails on its own - SKIP_TESTS[test_tarfile.py]=1 # too long to run on POWER 15 secs - SKIP_TESTS[test_venv.py]=1 # takes too long 11 seconds - fi ;; - 3.6) . ./3.6-exclude.sh - if (( batch )) ; then - # locale on test machine is probably non-default - SKIP_TESTS[test__locale.py]=1 - fi ;; 3.7) . ./3.7-exclude.sh - if (( batch )) ; then - SKIP_TESTS[test_distutils.py]=1 - SKIP_TESTS[test_fileio.py]=1 - SKIP_TESTS[test_zipimport_support.py]=1 - - fi ;; 3.8) . ./3.8-exclude.sh