From 412a811ddb37da37143cf80f8aa5a4326c04e42b Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 21 Jan 2020 07:15:47 -0500
Subject: [PATCH] Go over 2.5 runtest exclusions

---
 admin-tools/setup-master.sh |  2 +-
 test/stdlib/2.5-exclude.sh  | 41 +++++++++++++++++++++++++++++++++++++
 test/stdlib/runtests.sh     | 21 +------------------
 3 files changed, 43 insertions(+), 21 deletions(-)
 create mode 100644 test/stdlib/2.5-exclude.sh

diff --git a/admin-tools/setup-master.sh b/admin-tools/setup-master.sh
index 4d13c0a6..ba14afcd 100755
--- a/admin-tools/setup-master.sh
+++ b/admin-tools/setup-master.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-PYTHON_VERSION=3.7.5
+PYTHON_VERSION=3.7.6
 
 # FIXME put some of the below in a common routine
 function finish {
diff --git a/test/stdlib/2.5-exclude.sh b/test/stdlib/2.5-exclude.sh
new file mode 100644
index 00000000..c332d373
--- /dev/null
+++ b/test/stdlib/2.5-exclude.sh
@@ -0,0 +1,41 @@
+SKIP_TESTS=(
+    [test_coercion.py]=1
+    [test_decimal.py]=1
+    [test_dis.py]=1        # We change line numbers - duh!
+    [test_file.py]=1       # test assertion failures
+    [test_generators.py]=1 # Investigate
+    [test_grammar.py]=1    # Too many stmts. Handle large stmts
+    [test_grp.py]=1        # Long test - might work Control flow?
+    [test_macfs.py]=1      # it fails on its own
+    [test_macostools.py]=1 # it fails on its own
+    [test_mailbox.py]=1
+    [test_nis.py]=1        # it fails on its own
+    [test_normalization.py]=1 # it fails on its own
+    [test_optparse.py]=1   # it fails on its own
+    [test_ossaudiodev.py]=1 # it fails on its own
+    [test_pdb.py]=1        # Line-number specific
+    [test_pep277.py]=1    # it fails on its own
+    [test_pep352.py]=1     # Investigate
+    [test_plistlib.py]=1 # it fails on its own
+    [test_pwd.py]=1 # Long test - might work? Control flow?
+    [test_pyclbr.py]=1 # Investigate
+    [test_rgbimg.py]=1 #  it fails on its own
+    [test_queue.py]=1 # Control flow?
+    [test_scriptpackages.py]=1 # it fails on its own
+    [test_socketserver.py]=1 # Too long to run - 42 seconds
+    [test_sqlite.py]=1 # it fails on its own
+    [test_startfile.py]=1 # it fails on its own
+    [test_struct.py]=1 # "if and" confused for if .. assert and
+    [test_sunaudiodev.py]=1 # it fails on its own
+    [test_support.py]=1 # it fails on its own
+    [test_tcl.py=1] # it fails on its own
+    [test_threading.py]=1 # test takes too long to run: 11 seconds
+    [test_thread.py]=1 # test takes too long to run: 36 seconds
+    [test_trace.py]=1  # Line numbers are expected to be different
+    [test_urllib2net.py]=1 # is interactive?
+    [test_urllibnet.py]=1 # it fails on its own
+    [test_winreg.py]=1 # it fails on its own
+    [test_winsound.py[=1 # it fails on its own
+    [test_zipfile64.py]=1  # Runs ok but takes 204 seconds
+    [test_zlib]=1  # fails on its own
+)
diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh
index 871e72b2..9e1b6aa3 100755
--- a/test/stdlib/runtests.sh
+++ b/test/stdlib/runtests.sh
@@ -67,26 +67,7 @@ case $PYVERSION in
 	)
 	;;
     2.5)
-	SKIP_TESTS=(
- 	    [test_coercion.py]=1
- 	    [test_decimal.py]=1
- 	    [test_dis.py]=1        # We change line numbers - duh!
-	    [test_generators.py]=1 # Investigate
-	    [test_grammar.py]=1    # Too many stmts. Handle large stmts
-	    [test_grp.py]=1        # Long test - might work Control flow?
-	    [test_pdb.py]=1        # Line-number specific
-	    [test_pep352.py]=1     # Investigate
-	    [test_pwd.py]=1 # Long test - might work? Control flow?
-	    [test_pyclbr.py]=1 # Investigate
-	    [test_queue.py]=1 # Control flow?
-	    [test_socketserver.py]=1 # Too long to run - 42 seconds
-	    [test_struct.py]=1 # "if and" confused for if .. assert and
-	    [test_threading.py]=1 # test takes too long to run: 11 seconds
-	    [test_thread.py]=1 # test takes too long to run: 36 seconds
-	    [test_trace.py]=1  # Line numbers are expected to be different
-	    [test_urllib2net.py]=1 # is interactive?
-	    [test_zipfile64.py]=1  # Runs ok but takes 204 seconds
-	)
+	. ./2.5-exclude.sh
 	;;
     2.6)
 	. ./2.6-exclude.sh