6 files changed, 102 insertions, 113 deletions
diff --git a/debian/tests/control b/debian/tests/control
index 57aa319..6a9d7b2 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,19 +1,46 @@
 Tests: testsuite
-Depends: build-essential, locales, python3.6-dev, libpython3.6-testsuite, python3-gdbm
+Depends: build-essential,
+  locales-all,
+  python3.7-dev,
+  libpython3.7-testsuite,
+  python3-gdbm,
+  python3-distutils,
+  python3-tk,
+  idle-python3.7,
 # need to turn off apport
 Restrictions: needs-root
 
 Tests: testsuite-dbg
-Depends: build-essential, locales, python3.6-dev, python3.6-dbg, libpython3.6-testsuite, python3-gdbm-dbg, gdb
+Depends: build-essential,
+  locales-all, python3.7-dev,
+  python3.7-dbg,
+  libpython3.7-testsuite,
+  python3-gdbm-dbg,
+  gdb,
+  python3-distutils,
+  python3-tk-dbg,
+  idle-python3.7,
 # need to turn off apport
 Restrictions: needs-root
 
 Tests: failing-tests
-Depends: build-essential, locales, python3.6-dev, libpython3.6-testsuite, python3-gdbm
+Depends: build-essential,
+  locales-all,
+  python3.7-dev,
+  libpython3.7-testsuite,
+  python3-gdbm,
+  python3-distutils,
 # need to turn off apport
 Restrictions: needs-root allow-stderr
 
 Tests: failing-tests-dbg
-Depends: build-essential, locales, python3.6-dev, python3.6-dbg, libpython3.6-testsuite, python3-gdbm-dbg, gdb
+Depends: build-essential,
+  locales-all,
+  python3.7-dev,
+  python3.7-dbg,
+  libpython3.7-testsuite,
+  python3-gdbm-dbg,
+  gdb,
+  python3-distutils,
 # need to turn off apport
 Restrictions: needs-root allow-stderr
diff --git a/debian/tests/failing-tests b/debian/tests/failing-tests
index 0272cc0..1ee6f38 100644..100755
--- a/debian/tests/failing-tests
+++ b/debian/tests/failing-tests
@@ -17,41 +17,21 @@ if [ "$(whoami)" = root ]; then
 fi
 
 tmphome=$ADTTMP/home
-mkdir -p $tmphome/.local/lib/python3.6/site-packages
+mkdir -p $tmphome/.local/lib/python3.7/site-packages
 if [ -n "$su_user" ]; then
   chmod go+rx $ADTTMP
   chown $su_user:nogroup $tmphome
 fi
 ls -la $ADTTMP
 
-# no root access needed after this point
-
 debian_dir=$(dirname $(dirname $0))
 
-export LOCPATH=$(pwd)/locales
-sh $debian_dir/locale-gen
-
-export LANG=C
-
-TESTPYTHON="python3.6 -W default -bb -E -R -m test"
-TESTOPTS="-j 1 -w -uall,-network,-urlfetch,-gui"
-TESTEXCLUSIONS=
-
-# test_code_module: http://bugs.python.org/issue25109
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_code_module"
-
-# test_dbm: Fails from time to time ...
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_dbm"
-
-# test_ensurepip: not yet installed, http://bugs.debian.org/732703
-# ... and then test_venv fails too
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_ensurepip test_venv "
+# no root access needed after this point
 
-# test_site: Investigate why this fails ... our package has one sitedir less
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_site"
+TESTPYTHON="python3.7 -W default -bb -E -R -m test"
+TESTEXCLUSIONS=""
 
-# test_zipfile: Issue 17753, requires write access to test and email.test
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile"
+. $debian_dir/tests/test-common.sh
 
 if [ "$su_user" = nobody ]; then
   log=/dev/null
@@ -64,7 +44,7 @@ echo "Running the failing tests with the standard interpreter:"
 progressions=
 for tst in $TESTEXCLUSIONS; do
   if [ -f "$script" ]; then
-    cmd="HOME=$tmphome python3.6 $script \"$log\" \"$TESTPYTHON $TESTOPTS $tst\""
+    cmd="HOME=$tmphome python3.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $tst\""
   else
     cmd="HOME=$tmphome $TESTPYTHON $TESTOPTS $tst"
   fi
diff --git a/debian/tests/failing-tests-dbg b/debian/tests/failing-tests-dbg
index e2581b1..8b2247f 100644..100755
--- a/debian/tests/failing-tests-dbg
+++ b/debian/tests/failing-tests-dbg
@@ -17,41 +17,21 @@ if [ "$(whoami)" = root ]; then
 fi
 
 tmphome=$ADTTMP/home
-mkdir -p $tmphome/.local/lib/python3.6/site-packages
+mkdir -p $tmphome/.local/lib/python3.7/site-packages
 if [ -n "$su_user" ]; then
   chmod go+rx $ADTTMP
   chown $su_user:nogroup $tmphome
 fi
 ls -la $ADTTMP
 
-# no root access needed after this point
-
 debian_dir=$(dirname $(dirname $0))
 
-export LOCPATH=$(pwd)/locales
-sh $debian_dir/locale-gen
-
-export LANG=C
-
-TESTPYTHON="python3.6dm -W default -bb -E -R -m test"
-TESTOPTS="-j 1 -w -uall,-network,-urlfetch,-gui"
-TESTEXCLUSIONS=
-
-# test_code_module: http://bugs.python.org/issue25109
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_code_module"
-
-# test_dbm: Fails from time to time ...
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_dbm"
-
-# test_ensurepip: not yet installed, http://bugs.debian.org/732703
-# ... and then test_venv fails too
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_ensurepip test_venv "
+# no root access needed after this point
 
-# test_site: Investigate why this fails ... our package has one sitedir less
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_site"
+TESTPYTHON="python3.7dm -W default -bb -E -R -m test"
+TESTEXCLUSIONS=""
 
-# test_zipfile: Issue 17753, requires write access to test and email.test
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile"
+. $debian_dir/tests/test-common.sh
 
 if [ "$su_user" = nobody ]; then
   log=/dev/null
@@ -64,7 +44,7 @@ echo "Running the failing tests with the debug enabled interpreter:"
 progressions=
 for tst in $TESTEXCLUSIONS; do
   if [ -f "$script" ]; then
-    cmd="HOME=$tmphome python3.6 $script \"$log\" \"$TESTPYTHON $TESTOPTS $tst\""
+    cmd="HOME=$tmphome python3.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $tst\""
   else
     cmd="HOME=$tmphome $TESTPYTHON $TESTOPTS $tst"
   fi
diff --git a/debian/tests/test-common.sh b/debian/tests/test-common.sh
new file mode 100644
index 0000000..e85869e
--- /dev/null
+++ b/debian/tests/test-common.sh
@@ -0,0 +1,47 @@
+
+if dpkg-vendor --derives-from Ubuntu; then
+  vendor=Ubuntu
+elif dpkg-vendor --derives-from Debian; then
+  vendor=Debian
+else
+  vendor=Unknown
+fi
+
+export LOCPATH=$(pwd)/locales
+sh $debian_dir/locale-gen
+
+export LANG=C.UTF-8
+
+export DEB_PYTHON_INSTALL_LAYOUT=deb_system
+
+TESTOPTS="-j 1 -w -uall,-network,-urlfetch,-gui"
+
+# test_dbm: Fails from time to time ...
+#TESTEXCLUSIONS="$TESTEXCLUSIONS test_dbm"
+
+# test_ensurepip: not yet installed, http://bugs.debian.org/732703
+# ... and then test_venv fails too
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_ensurepip test_venv "
+
+# test_lib2to3: see https://bugs.python.org/issue34286
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_lib2to3"
+
+# test_tcl: see https://bugs.python.org/issue34178
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_tcl"
+
+# FIXME: Failing with OpenSSL 1.2 ...
+# ssl.SSLError: [SSL: CA_MD_TOO_WEAK] ca md too weak (_ssl.c:3401)
+if [ "$vendor" = Debian ]; then
+  TESTEXCLUSIONS="$TESTEXCLUSIONS test_asyncio test_ftplib test_httplib test_imaplib test_nntplib test_poplib test_ssl"
+fi
+
+# FIXME: testWithTimeoutTriggeredSend: timeout not raised by _sendfile_use_sendfile
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_socket"
+
+# FIXME: issue 34806: some distutils tests fail recently
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_distutils"
+
+# FIXME, failing on the Ubuntu autopkg testers
+if [ "$vendor" = Ubuntu ]; then
+  TESTEXCLUSIONS="$TESTEXCLUSIONS test_code_module test_platform test_site"
+fi
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 49e70f3..ad6bfa0 100644..100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+env
+
 set -e
 
 if [ "$(whoami)" = root ]; then
@@ -24,45 +26,20 @@ fi
 ls -la $ADTTMP
 
 tmphome=$ADTTMP/home
-mkdir -p $tmphome/.local/lib/python3.6/site-packages
+mkdir -p $tmphome/.local/lib/python3.7/site-packages
 if [ -n "$su_user" ]; then
   chmod -R go+rx $ADTTMP
   chown -R $su_user:nogroup $tmphome
 fi
 
-# no root access needed after this point
-
 debian_dir=$(dirname $(dirname $0))
 
-export LOCPATH=$(pwd)/locales
-sh $debian_dir/locale-gen
-
-export LANG=C
+# no root access needed after this point
 
-TESTPYTHON="python3.6 -W default -bb -E -R -m test"
-TESTOPTS="-j 1 -w -uall,-network,-urlfetch,-gui"
+TESTPYTHON="python3.7 -W default -bb -E -R -m test"
 TESTEXCLUSIONS="-x"
 
-# test_code_module: http://bugs.python.org/issue25109
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_code_module"
-
-# test_dbm: Fails from time to time ...
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_dbm"
-
-# test_ensurepip: not yet installed, http://bugs.debian.org/732703
-# ... and then test_venv fails too
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_ensurepip test_venv "
-
-# test_gdb: not run for the optimized build
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_gdb"
-
-# test_site: Investigate why this fails ... our package has one sitedir less
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_site"
-
-# test_zipfile: Issue 17753, requires write access to test and email.test
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile"
-
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_socket"
+. $debian_dir/tests/test-common.sh
 
 if [ "$su_user" = nobody ]; then
   log=/dev/null
@@ -76,7 +53,7 @@ EXTRAENV="env -u https_proxy -u http_proxy -u no_proxy HOME=$tmphome"
 
 script=$debian_dir/script.py
 if [ -f "$script" ]; then
-  cmd="$EXTRAENV python3.6 $script \"$log\" \"$TESTPYTHON $TESTOPTS $TESTEXCLUSIONS\""
+  cmd="$EXTRAENV python3.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $TESTEXCLUSIONS\""
 else
   cmd="$EXTRAENV $TESTPYTHON $TESTOPTS $TESTEXCLUSIONS"
 fi
diff --git a/debian/tests/testsuite-dbg b/debian/tests/testsuite-dbg
index 0cf994d..fce9eb9 100644..100755
--- a/debian/tests/testsuite-dbg
+++ b/debian/tests/testsuite-dbg
@@ -17,43 +17,21 @@ if [ "$(whoami)" = root ]; then
 fi
 
 tmphome=$ADTTMP/home
-mkdir -p $tmphome/.local/lib/python3.6/site-packages
+mkdir -p $tmphome/.local/lib/python3.7/site-packages
 if [ -n "$su_user" ]; then
   chmod -R go+rx $ADTTMP
   chown -R $su_user:nogroup $tmphome
 fi
 ls -la $ADTTMP
 
-# no root access needed after this point
-
 debian_dir=$(dirname $(dirname $0))
 
-export LOCPATH=$(pwd)/locales
-sh $debian_dir/locale-gen
-
-export LANG=C
+# no root access needed after this point
 
-TESTPYTHON="python3.6dm -W default -bb -E -R -m test"
-TESTOPTS="-j 1 -w -uall,-network,-urlfetch,-gui"
+TESTPYTHON="python3.7dm -W default -bb -E -R -m test"
 TESTEXCLUSIONS="-x"
 
-# test_code_module: http://bugs.python.org/issue25109
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_code_module"
-
-# test_dbm: Fails from time to time ...
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_dbm"
-
-# test_ensurepip: not yet installed, http://bugs.debian.org/732703
-# ... and then test_venv fails too
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_ensurepip test_venv "
-
-# test_site: Investigate why this fails ... our package has one sitedir less
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_site"
-
-# test_zipfile: Issue 17753, requires write access to test and email.test
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile"
-
-TESTEXCLUSIONS="$TESTEXCLUSIONS test_socket"
+. $debian_dir/tests/test-common.sh
 
 if [ "$su_user" = nobody ]; then
   log=/dev/null
@@ -67,7 +45,7 @@ EXTRAENV="env -u https_proxy -u http_proxy -u no_proxy HOME=$tmphome"
 
 script=$debian_dir/script.py
 if [ -f "$script" ]; then
-  cmd="$EXTRAENV python3.6 $script \"$log\" \"$TESTPYTHON $TESTOPTS $TESTEXCLUSIONS\""
+  cmd="$EXTRAENV python3.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $TESTEXCLUSIONS\""
 else
   cmd="$EXTRAENV $TESTPYTHON $TESTOPTS $TESTEXCLUSIONS"
 fi