bpo-30822: regrtest: remove tzdata (#2782)

* Oops, tzdata was introduced in Python 3.6: remove it from regrtest
* Remove also Lib/test/libregrtest/__init__.py file: add by mistake
  on a backport.

diff --git a/Lib/test/libregrtest/__init__.py b/Lib/test/libregrtest/__init__.py
deleted file mode 100644 (file)
index 3427b51..0000000
--- a/Lib/test/libregrtest/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# We import importlib *ASAP* in order to test #15386
-import importlib
-
-from test.libregrtest.cmdline import _parse_args, RESOURCE_NAMES, ALL_RESOURCES
-from test.libregrtest.main import main

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index c3459345838816c5ed2752a80e3468ae9b2ed1d0..8b63d91e5cde4f6f0c786ad990c237020383ee35 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -214,10 +214,7 @@ ALL_RESOURCES = ('audio', 'curses', 'largefile', 'network',
 #
 # - extralagefile (ex: test_zipfile64): really too slow to be enabled
 #   "by default"
-# - tzdata: while needed to validate fully test_datetime, it makes
-#   test_datetime too slow (15-20 min on some buildbots) and so is disabled by
-#   default (see bpo-30822).
-RESOURCE_NAMES = ALL_RESOURCES + ('extralargefile', 'tzdata')
+RESOURCE_NAMES = ALL_RESOURCES + ('extralargefile',)
 
 # When tests are run from the Python build directory, it is best practice
 # to keep the test files in a subfolder.  This eases the cleanup of leftover

diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index dc5899203cbc4d9d2c81fd7791adaa3e97ebc651..2618b0f8735eda5bf9d17824176919943eb7e557 100644 (file)
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -204,9 +204,9 @@ class ParseArgsTestCase(unittest.TestCase):
                 self.checkError([opt, 'foo'], 'invalid resource')
 
                 # all + a resource not part of "all"
-                ns = regrtest._parse_args([opt, 'all,tzdata'])
+                ns = regrtest._parse_args([opt, 'all,extralargefile'])
                 self.assertEqual(ns.use_resources,
-                                 list(regrtest.ALL_RESOURCES) + ['tzdata'])
+                                 list(regrtest.ALL_RESOURCES) + ['extralargefile'])
 
                 # test another resource which is not part of "all"
                 ns = regrtest._parse_args([opt, 'extralargefile'])

diff --git a/Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst b/Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst
index 53557f66feffa9304d1b1674017a540fd2d73177..ee0cf02c703777571c78b53e73aca76d0d86c066 100644 (file)
--- a/Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst
+++ b/Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst
@@ -1,5 +1,2 @@
-regrtest: Exclude tzdata from regrtest --all. When running the test suite
-using --use=all / -u all, exclude tzdata since it makes test_datetime too
-slow (15-20 min on some buildbots) which then times out on some buildbots.
-Fix also regrtest command line parser to allow passing -u extralargefile to
+Fix regrtest command line parser to allow passing -u extralargefile to
 run test_zipfile64.