From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 16 Mar 2013 06:37:06 +0000 (-0400)
Subject: Issue # 10652: make tcl/tk tests run after __all__ test, patch by Zachary Ware.
X-Git-Tag: v3.2.4rc1~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=743c85a32e3623fa1fcdeefc9e31e53d74d700db;p=thirdparty%2FPython%2Fcpython.git

Issue # 10652: make tcl/tk tests run after __all__ test, patch by Zachary Ware.
---

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index d38c0b5bb8ad..0cc21c9f2b9a 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 f993c5358a83..7551a7f4709c 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 b8c1a4ca1007..3a3459bdd2e1 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 566fc9d09a04..1cfeb15d2a0f 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 cac3957fe789..ce7a9e42269c 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