summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-16 02:37:06 -0400
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-16 02:37:06 -0400
commit743c85a32e3623fa1fcdeefc9e31e53d74d700db (patch)
treed34a29b501769fac0d912db2fbdb39bd404403e8
parent612528d95db89c9e728db979c65ed7d774291ba1 (diff)
downloadcpython-git-743c85a32e3623fa1fcdeefc9e31e53d74d700db.tar.gz
Issue # 10652: make tcl/tk tests run after __all__ test, patch by Zachary Ware.
-rw-r--r--Lib/test/test_tcl.py3
-rw-r--r--Lib/test/test_tk.py3
-rw-r--r--Lib/test/test_ttk_guionly.py3
-rw-r--r--Lib/test/test_ttk_textonly.py3
-rw-r--r--Misc/NEWS3
5 files changed, 15 insertions, 0 deletions
diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index d38c0b5bb8..0cc21c9f2b 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -8,6 +8,9 @@ from test import support
# Skip this test if the _tkinter module wasn't built.
_tkinter = support.import_module('_tkinter')
+# Make sure tkinter._fix runs to set up the environment
+support.import_fresh_module('tkinter')
+
from tkinter import Tcl
from _tkinter import TclError
diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py
index f993c5358a..7551a7f470 100644
--- a/Lib/test/test_tk.py
+++ b/Lib/test/test_tk.py
@@ -2,6 +2,9 @@ from test import support
# Skip test if _tkinter wasn't built.
support.import_module('_tkinter')
+# Make sure tkinter._fix runs to set up the environment
+support.import_fresh_module('tkinter')
+
# Skip test if tk cannot be initialized.
from tkinter.test.support import check_tk_availability
check_tk_availability()
diff --git a/Lib/test/test_ttk_guionly.py b/Lib/test/test_ttk_guionly.py
index b8c1a4ca10..3a3459bdd2 100644
--- a/Lib/test/test_ttk_guionly.py
+++ b/Lib/test/test_ttk_guionly.py
@@ -5,6 +5,9 @@ from test import support
# Skip this test if _tkinter wasn't built.
support.import_module('_tkinter')
+# Make sure tkinter._fix runs to set up the environment
+support.import_fresh_module('tkinter')
+
# Skip test if tk cannot be initialized.
from tkinter.test.support import check_tk_availability
check_tk_availability()
diff --git a/Lib/test/test_ttk_textonly.py b/Lib/test/test_ttk_textonly.py
index 566fc9d09a..1cfeb15d2a 100644
--- a/Lib/test/test_ttk_textonly.py
+++ b/Lib/test/test_ttk_textonly.py
@@ -4,6 +4,9 @@ from test import support
# Skip this test if _tkinter does not exist.
support.import_module('_tkinter')
+# Make sure tkinter._fix runs to set up the environment
+support.import_fresh_module('tkinter')
+
from tkinter.test import runtktests
def test_main():
diff --git a/Misc/NEWS b/Misc/NEWS
index cac3957fe7..ce7a9e4226 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -964,6 +964,9 @@ Extension Modules
Tests
-----
+- Issue # 10652: make tcl/tk tests run after __all__ test, patch by
+ Zachary Ware.
+
- Issue #11963: remove human verification from test_parser and test_subprocess.
- Issue #11732: add a new suppress_crash_popup() context manager to test.support