changeset: 84870:dd9941f5fcda
branch: 2.7
parent: 84865:c0788ee86a65
user: Terry Jan Reedy <tjreedy@udel.edu>
date: Sun Jul 21 20:13:24 2013 -0400
files: Lib/idlelib/idle_test/test_text.py Lib/test/test_idle.py
description:
Issue #18441: Make test.support.requires('gui') skip when it should.
(Consolidating this check and various checks in tkinter files and moving them
to test.support and test.regrtest will be another issue.)
diff -r c0788ee86a65 -r dd9941f5fcda Lib/idlelib/idle_test/test_text.py
--- a/Lib/idlelib/idle_test/test_text.py	Sat Jul 27 15:54:05 2013 -0400
+++ b/Lib/idlelib/idle_test/test_text.py	Sun Jul 21 20:13:24 2013 -0400
@@ -216,10 +216,7 @@
 requires('gui')
 from Tkinter import Tk, Text
 cls.Text = Text
- try:
- cls.root = Tk()
- except TclError as msg:
- raise unittest.SkipTest('TclError: %s' % msg)
+ cls.root = Tk()
 
 @classmethod
 def tearDownClass(cls):
diff -r c0788ee86a65 -r dd9941f5fcda Lib/test/test_idle.py
--- a/Lib/test/test_idle.py	Sat Jul 27 15:54:05 2013 -0400
+++ b/Lib/test/test_idle.py	Sun Jul 21 20:13:24 2013 -0400
@@ -1,9 +1,21 @@
-# Skip test if _tkinter or _thread wasn't built or idlelib was deleted.
-from test.test_support import import_module
-import_module('Tkinter')
-import_module('threading') # imported by PyShell, imports _thread
+# Skip test if _thread or _tkinter wasn't built or idlelib was deleted.
+from test.test_support import import_module, use_resources
+import_module('threading') # imported by idlelib.PyShell, imports _thread
+tk = import_module('Tkinter')
 idletest = import_module('idlelib.idle_test')
 
+# If buildbot improperly sets gui resource (#18365, #18441), remove it
+# so requires('gui') tests are skipped while non-gui tests still run.
+if use_resources and 'gui' in use_resources:
+ try:
+ root = tk.Tk()
+ root.destroy()
+ except TclError:
+ while True:
+ use_resources.delete('gui')
+ if 'gui' not in use_resources:
+ break
+
 # 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.)
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/dd9941f5fcda">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/dd9941f5fcda" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>