summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_idle.py
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2016-06-26 21:48:02 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2016-06-26 21:48:02 (GMT)
commit7c1534141d3a159a32db9742e1d201d5c7a9ba81 (patch)
tree79b51cbe7fd2eb90850d6673515862c0834453ca /Lib/test/test_idle.py
parentb554faddf5d721d1d0039c57aae920f3156a5eb2 (diff)
downloadcpython-7c1534141d3a159a32db9742e1d201d5c7a9ba81.zip
cpython-7c1534141d3a159a32db9742e1d201d5c7a9ba81.tar.gz
cpython-7c1534141d3a159a32db9742e1d201d5c7a9ba81.tar.bz2
Issue 27372: Stop test_idle from changing locale, so test passes.
In 3.6, the warning is now called an error, making it harder to ignore.
Diffstat (limited to 'Lib/test/test_idle.py')
-rw-r--r--Lib/test/test_idle.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py
index 9d52394..ad88e24 100644
--- a/Lib/test/test_idle.py
+++ b/Lib/test/test_idle.py
@@ -1,18 +1,21 @@
import unittest
from test.support import import_module
-# Skip test if _thread or _tkinter wasn't built or idlelib was deleted.
+# Skip test if _thread or _tkinter wasn't built, or idlelib is missing,
+# or if tcl/tk version before 8.5, which is needed for ttk widgets.
+
import_module('threading') # imported by PyShell, imports _thread
tk = import_module('tkinter') # imports _tkinter
if tk.TkVersion < 8.5:
raise unittest.SkipTest("IDLE requires tk 8.5 or later.")
tk.NoDefaultRoot()
-idletest = import_module('idlelib.idle_test')
+idlelib = import_module('idlelib')
+idlelib.testing = True # Avoid locale-changed test error
-# Without test_main present, regrtest.runtest_inner (line1219) calls
-# unittest.TestLoader().loadTestsFromModule(this_module) which calls
-# load_tests() if it finds it. (Unittest.main does the same.)
-load_tests = idletest.load_tests
+# Without test_main present, test.libregrtest.runtest.runtest_inner
+# calls (line 173) unittest.TestLoader().loadTestsFromModule(module)
+# which calls load_tests() if it finds it. (Unittest.main does the same.)
+from idlelib.idle_test import load_tests
if __name__ == '__main__':
unittest.main(verbosity=2, exit=False)