summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_tk.py
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-06-02 21:01:29 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-06-02 21:01:29 (GMT)
commit66f29284797c31190ad06554d9909d7ed8a894d1 (patch)
tree0388a5b7cd0084afc8ed45855bb16f0d631971e1 /Lib/test/test_tk.py
parent8dd49fe09fc4ac3b527914a0703c0dc0429aa125 (diff)
downloadcpython-66f29284797c31190ad06554d9909d7ed8a894d1.zip
cpython-66f29284797c31190ad06554d9909d7ed8a894d1.tar.gz
cpython-66f29284797c31190ad06554d9909d7ed8a894d1.tar.bz2
Issue #18492: Allow all resources when tests are not run by regrtest.py.
This changeset also includes cleanup allowed by this behavior change.
Diffstat (limited to 'Lib/test/test_tk.py')
-rw-r--r--Lib/test/test_tk.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py
index 589f66d..62729f0 100644
--- a/Lib/test/test_tk.py
+++ b/Lib/test/test_tk.py
@@ -10,15 +10,9 @@ support.requires('gui')
from tkinter.test import runtktests
-def test_main(enable_gui=False):
- if enable_gui:
- if support.use_resources is None:
- support.use_resources = ['gui']
- elif 'gui' not in support.use_resources:
- support.use_resources.append('gui')
-
+def test_main():
support.run_unittest(
*runtktests.get_tests(text=False, packages=['test_tkinter']))
if __name__ == '__main__':
- test_main(enable_gui=True)
+ test_main()