gh-54781: Move Lib/tkinter/test/test_ttk/ to Lib/test/test_ttk/ #94070

vstinner · 2022-06-21T15:39:30Z

Move Lib/tkinter/test/ to Lib/test/test_tkinter/.

Rename test_tk to test_tkinter, and rename test_ttk_guionly to test_ttk.

gh-54781

vstinner · 2022-06-21T15:41:05Z

I can still run tests on an newly installed (patched) Python 3.12:

$ /opt/py3.12/bin/python3.12 -m test test_tkinter -u all -v
(...)
Ran 731 tests in 6.853s

$ /opt/py3.12/bin/python3.12 -m test test_ttk -u all -v
(...)
Ran 308 tests in 7.905s

$ /opt/py3.12/bin/python3.12 -m test test_tkinter
test_tkinter skipped -- Use of the 'gui' resource not enabled
test_tkinter skipped (resource denied)

$ /opt/py3.12/bin/python3.12 -m test test_ttk
test_ttk skipped -- Use of the 'gui' resource not enabled
test_ttk skipped (resource denied)

vstinner · 2022-06-21T15:42:19Z

Rename test_tk to test_tkinter

For me, it's disturbing when tests don't have the same name than the tested module. asyncio => test_asyncio. tkinter => test_tk ???

rename test_ttk_guionly to test_ttk

I can keep test_ttk_guionly name if you prefer, but for me, tests should use the GUI. Only the special tests test_ttk_textonly should have a special name, no?

vstinner · 2022-06-21T15:42:32Z

cc @terryjreedy @serhiy-storchaka

vstinner · 2022-06-21T15:46:43Z

This PR is special. I made the new directory tree "flat". support.py and test_simpledialog.py now lives in Lib/test/test_tkinter/. Previously, test_simpledialog.py was in a test_tkinter/ sub-directory.

Before:

Lib/tkinter/test/
Lib/tkinter/test/README
Lib/tkinter/test/__init__.py
Lib/tkinter/test/support.py
Lib/tkinter/test/test_tkinter
Lib/tkinter/test/test_tkinter/__init__.py
Lib/tkinter/test/test_tkinter/test_colorchooser.py
Lib/tkinter/test/test_tkinter/test_font.py
Lib/tkinter/test/test_tkinter/test_geometry_managers.py
Lib/tkinter/test/test_tkinter/test_images.py
Lib/tkinter/test/test_tkinter/test_loadtk.py
Lib/tkinter/test/test_tkinter/test_messagebox.py
Lib/tkinter/test/test_tkinter/test_misc.py
Lib/tkinter/test/test_tkinter/test_simpledialog.py
Lib/tkinter/test/test_tkinter/test_text.py
Lib/tkinter/test/test_tkinter/test_variables.py
Lib/tkinter/test/test_tkinter/test_widgets.py
Lib/tkinter/test/test_ttk
Lib/tkinter/test/test_ttk/__init__.py
Lib/tkinter/test/test_ttk/test_extensions.py
Lib/tkinter/test/test_ttk/test_style.py
Lib/tkinter/test/test_ttk/test_widgets.py
Lib/tkinter/test/widget_tests.py

After:

Lib/test/test_ttk/
Lib/test/test_ttk/__init__.py
Lib/test/test_ttk/test_extensions.py
Lib/test/test_ttk/test_style.py
Lib/test/test_ttk/test_widgets.py

Lib/test/test_tkinter/
Lib/test/test_tkinter/README
Lib/test/test_tkinter/__init__.py
Lib/test/test_tkinter/support.py
Lib/test/test_tkinter/test_colorchooser.py
Lib/test/test_tkinter/test_font.py
Lib/test/test_tkinter/test_geometry_managers.py
Lib/test/test_tkinter/test_images.py
Lib/test/test_tkinter/test_loadtk.py
Lib/test/test_tkinter/test_messagebox.py
Lib/test/test_tkinter/test_misc.py
Lib/test/test_tkinter/test_simpledialog.py
Lib/test/test_tkinter/test_text.py
Lib/test/test_tkinter/test_variables.py
Lib/test/test_tkinter/test_widgets.py
Lib/test/test_tkinter/widget_tests.py

vstinner · 2022-06-21T15:49:37Z

Windows (x64) job failed but I cannot get the logs. I cancelled the workflow. I still cannot see the logs. Strange.

zware · 2022-06-21T15:51:23Z

Windows (x64) job failed but I cannot get the logs. I cancelled the workflow. I still cannot see the logs. Strange.

The failure is unrelated, see #94068.

vstinner · 2022-06-21T16:00:19Z

Oh. Windows build failed with an unrelated error:

Error: D:\a\cpython\cpython\Modules\socketmodule.c(7475,5): error C2065: 'HVSOCKET_CONTAINER_PASSTHRU': undeclared identifier [D:\a\cpython\cpython\PCbuild_socket.vcxproj]

zooba · 2022-06-21T16:01:50Z

Yeah, seems we're in the middle of the rollout of new CI images, so there's a chance you'll get the older image and not see the error. But you'll need my PR for it to be reliable.

serhiy-storchaka · 2022-06-21T16:11:35Z

Lib/test/test_tkinter/__init__.py


-if __name__ == '__main__':


Does python -m test.test_tkinter still work?

It would work if a __main__ module gets added. But it was test.test_tk before, not test.test_tkinter.

Ah you care about this command? If you do, I can add a __main__.py file.

Yes, please add it. And test different ways of running tests:

python -m test.test_xxx python -m unittest test.test_xxx python -m test test_xxx

I added __main__ sub-modules. Example:

./python -m test.test_ttk -v ./python -m test test_ttk -v -u all ./python -m unittest test.test_ttk -v

The 3 commands end with: Ran 308 tests.

serhiy-storchaka · 2022-06-21T16:11:35Z

Lib/test/test_tkinter/__init__.py

-if __name__ == '__main__':
-    unittest.main()
+def load_tests(*args):
+    return support.load_package_tests(os.path.dirname(__file__), *args)


Why not use just loader.discover()?

I copy/paste the code from test_asyncio, it works, so I didn't change it :-)

Does loader.discover() work with zipimport?

Does loader.discover() work with zipimport?

I have no idea. If there is an issue, I suggest to fix all load_tests() functions of Lib/test/ in a separated PR.

serhiy-storchaka · 2022-06-21T16:12:39Z

Should it be backported?

terryjreedy · 2022-06-21T16:20:22Z

I would prefer that ttk tests be included under test_tkinter, with names like test_ttk_widgets, so that python -m test.test_tkinter (and python -m test -ugui test_tkinter) tests everything. But re-organization details are up to Serhiy.

terryjreedy · 2022-06-21T16:25:55Z

This patch will require changes to the scripts *nix distributions use to make tkinter (and IDLE) a separate install. I don't know how they would feel about backports.

vstinner · 2022-06-21T17:41:41Z

I rebased the PR to get the fix for the Windows build: #94068

vstinner · 2022-06-21T17:43:48Z

Should it be backported?

This specific PR change the name of two tests, so no, it should not be backported.

It also changes the build system (Linux, VS project). Honestly, it sounds risky and I would prefer to not backport it.

vstinner · 2022-06-21T17:45:05Z

I would prefer that ttk tests be included under test_tkinter

Oh. I tried to minimize changes in this PR. But I'm open to reorganizing tests.

@serhiy-storchaka: Are you fine with the 2 proposed tests, or do you want to merge them?

vstinner · 2022-06-21T17:46:35Z

This patch will require changes to the scripts *nix distributions use to make tkinter (and IDLE) a separate install. I don't know how they would feel about backports.

Once issue #54781 will be fixed, I will properly document these changes in What's New in Python 3.12. IMO it fits into the Build Changes section.

serhiy-storchaka · 2022-06-21T19:32:55Z

Are you fine with the 2 proposed tests, or do you want to merge them?

I was going to ask about merging them, but I am fine with the current state of this PR. If you are going to merge test_ttk into test_tkinter, do not forget about test_tcl.

Maybe do this in a separate PR?

vstinner · 2022-06-21T20:22:54Z

I was going to ask about merging them, but I am fine with the current state of this PR. If you are going to merge test_ttk into test_tkinter, do not forget about test_tcl.

Oh, merging 3 Tkinter tests sound out of my skills. I don't know well this module and I would prefer if someone else do it.

Here I'm trying to focus on fixing the 12 years old issue #54781 :-) Perfect is the enemy of good ;-)

vstinner · 2022-06-21T21:30:46Z

@serhiy-storchaka: Does it look good to you like that?

vstinner · 2022-06-22T16:08:23Z

@serhiy-storchaka wrote "I am fine with the current state of this PR". I plan to merge the PR tomorrow if I don't hear back from @serhiy-storchaka.

* Add Lib/test/test_ttk/__init__.py based on test_ttk_guionly.py. * Remove Lib/test/test_ttk_guionly.py.

Remove Lib/test/test_tk.py.

Fix spelling typo: involving (missing G) Remove useless "if __name__ == '__main__':" block from Lib/test/test_ttk/__init__.py: the package has a __main__.py sub-module.

serhiy-storchaka

LGTM.

But I see that Git does not recognize renaming of test_tk.py. It breaks history and future backports. Can something be done with this?

vstinner · 2022-06-22T20:20:09Z

But I see that Git does not recognize renaming of test_tk.py

I didn't rename test_tk.py to test_tkinter/init.py. I removed test_tk.py and copied test_asyncio/init.py to test_tkinter/init.py, and then modified test_tkinter/init.py.

test_tk.py was just 18 lines of code, I don't think its file history was very important.

vstinner · 2022-06-22T20:21:57Z

On the other side, git blame Lib/test/test_tkinter/test_widgets.py and git log --follow Lib/test/test_tkinter/test_widgets.py kept the file history for example.

vstinner requested a review from as a code owner Jun 21, 2022

bedevere-bot added the awaiting core review label Jun 21, 2022

vstinner mentioned this pull request Jun 21, 2022

Move test sub-packages to Lib/test #54781

Open

serhiy-storchaka requested review from serhiy-storchaka and removed request for Jun 21, 2022

vstinner closed this Jun 21, 2022

vstinner reopened this Jun 21, 2022

serhiy-storchaka reviewed Jun 21, 2022

View changes

vstinner force-pushed the test_tkinter branch from a3f3f5e to 46661f8 Compare Jun 21, 2022

vstinner added 2 commits Jun 22, 2022

pythongh-54781: Move Lib/tkinter/test/test_ttk/ to Lib/test/test_ttk/

9844364

* Add Lib/test/test_ttk/__init__.py based on test_ttk_guionly.py. * Remove Lib/test/test_ttk_guionly.py.

Move Lib/tkinter/test/ to Lib/test/test_tkinter/

0f60bef

vstinner added 6 commits Jun 22, 2022

Add Lib/test/test_tkinter/__init__.py

8ee5ffe

Remove Lib/test/test_tk.py.

Update imports

67ea5c0

Update references

e3ff9d5

Add NEWS entry

78fc0ca

Add __main__ sub-modules

bccf79d

Add missing unittest import

941d382

Fix spelling typo: involving (missing G) Remove useless "if __name__ == '__main__':" block from Lib/test/test_ttk/__init__.py: the package has a __main__.py sub-module.

vstinner force-pushed the test_tkinter branch from 6a9c059 to 941d382 Compare Jun 22, 2022

serhiy-storchaka approved these changes Jun 22, 2022

View changes

bedevere-bot added awaiting merge and removed awaiting core review labels Jun 22, 2022

vstinner merged commit c1fb12e into python:main Jun 22, 2022
14 checks passed

bedevere-bot removed the awaiting merge label Jun 22, 2022

vstinner deleted the test_tkinter branch Jun 22, 2022

gh-54781: Move Lib/tkinter/test/test_ttk/ to Lib/test/test_ttk/ #94070

gh-54781: Move Lib/tkinter/test/test_ttk/ to Lib/test/test_ttk/ #94070

vstinner commented Jun 21, 2022 •

edited by bedevere-bot

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

zware commented Jun 21, 2022

vstinner commented Jun 21, 2022

zooba commented Jun 21, 2022

serhiy-storchaka Jun 21, 2022

merwok Jun 21, 2022

vstinner Jun 21, 2022

serhiy-storchaka Jun 21, 2022

vstinner Jun 21, 2022

serhiy-storchaka Jun 21, 2022

vstinner Jun 21, 2022

serhiy-storchaka Jun 21, 2022

vstinner Jun 21, 2022

serhiy-storchaka commented Jun 21, 2022

terryjreedy commented Jun 21, 2022

terryjreedy commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022 •

edited

serhiy-storchaka commented Jun 21, 2022

vstinner commented Jun 21, 2022 •

edited

vstinner commented Jun 21, 2022

vstinner commented Jun 22, 2022

serhiy-storchaka left a comment

vstinner commented Jun 22, 2022

vstinner commented Jun 22, 2022

gh-54781: Move Lib/tkinter/test/test_ttk/ to Lib/test/test_ttk/ #94070

gh-54781: Move Lib/tkinter/test/test_ttk/ to Lib/test/test_ttk/ #94070

Conversation

vstinner commented Jun 21, 2022 • edited by bedevere-bot

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

zware commented Jun 21, 2022

vstinner commented Jun 21, 2022

zooba commented Jun 21, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

serhiy-storchaka commented Jun 21, 2022

terryjreedy commented Jun 21, 2022

terryjreedy commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022

vstinner commented Jun 21, 2022 • edited

serhiy-storchaka commented Jun 21, 2022

vstinner commented Jun 21, 2022 • edited

vstinner commented Jun 21, 2022

vstinner commented Jun 22, 2022

serhiy-storchaka left a comment

vstinner commented Jun 22, 2022

vstinner commented Jun 22, 2022

vstinner commented Jun 21, 2022 •

edited by bedevere-bot

vstinner commented Jun 21, 2022 •

edited

vstinner commented Jun 21, 2022 •

edited