Skip to content

gh-125669: Do not run -ugui tests by default on make test #125730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 30, 2024

Conversation

sobolevn
Copy link
Member

@sobolevn sobolevn commented Oct 19, 2024

Basically this PR changes how --fast-ci is defined and also disables gui tests with it. Because make tests spawns a lot of gui windows locally and distrurb the development workflow.

Most likely this won't affect any buildbots (if they correctly use --slow-ci). But, correct me if I am wrong.

Regular make test run now:

» make test
+ ./python.exe -u -W default -bb -E -m test --fast-ci --timeout= --dont-add-python-opts
== resources: all,-cpu,-gui

With TESTOPTS="-u gui" (or EXTRATESTOPS) passed:

» make test TESTOPTS="-u gui"
+ ./python.exe -u -W default -bb -E -m test --fast-ci --timeout= -u gui --dont-add-python-opts
== resources: all,-cpu

@vstinner
Copy link
Member

Most likely this won't affect any buildbots (if they correctly use --slow-ci). But, correct me if I am wrong.

Unix buildbots run make buildbottest which uses --slow-ci. Windows buildbots run Tools\buildbot\test.bat which also uses --slow-ci.

Basically this PR changes how --fast-ci is defined and also disables gui tests with it. Because make tests spawns a lot of gui windows locally and distrurb the development workflow.

Why not only changing the make test command rather than changing the --fast-ci option for everybody? You should be able to pass -u -gui to make test.

@vstinner
Copy link
Member

vstinner commented Oct 19, 2024

Something like:

diff --git a/Makefile.pre.in b/Makefile.pre.in
index fb6f22d5739..20621257575 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2097,7 +2097,7 @@ cleantest: all
 # Similar to buildbottest, but use --fast-ci option, instead of --slow-ci.
 .PHONY: test
 test: all
-       $(TESTRUNNER) --fast-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS)
+       $(TESTRUNNER) --fast-ci -u-gui --timeout=$(TESTTIMEOUT) $(TESTOPTS)
 
 # Run the test suite for both architectures in a Universal build on OSX.
 # Must be run on an Intel box.

@vstinner
Copy link
Member

Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a NEWS entry in the Tests category.

@sobolevn sobolevn requested a review from corona10 as a code owner October 30, 2024 09:27
@erlend-aasland
Copy link
Contributor

CI master @hugovk, are you ok with this PR?

PCbuild/rt.bat Outdated
@@ -34,7 +34,7 @@ set pyname=python
set suffix=
set qmode=
set dashO=
set regrtestargs=--fast-ci
set regrtestargs=--fast-ci -u-gui
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Buildbots run Tools/buildbot/test.bat which runs PCbuild/rt.bat. I'm not sure that this change is correct. Maybe it will disable GUI tests on buildbots.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, thanks for this question. I was not also sure about that. Since I don't ever use windows and not quite sure about how it should work. I will revert this.

Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for the different updates.

Copy link
Member

@hugovk hugovk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI master @hugovk, are you ok with this PR?

Looks good, thanks all! 👍

@sobolevn sobolevn merged commit 1f16df4 into python:main Oct 30, 2024
39 checks passed
@sobolevn
Copy link
Member Author

Thanks everyone! 👏

@warsaw
Copy link
Member

warsaw commented Oct 30, 2024

Thanks for fixing this! One ask:

I don't think that we should backport this change

Please reconsider. It's painful for the 3.13 branch and changing it would be a net win.

picnixz pushed a commit to picnixz/cpython that referenced this pull request Dec 8, 2024
…ython#125730)

Adds `make ci` target for use in CI and keeping `make test` for the local development.
ebonnal pushed a commit to ebonnal/cpython that referenced this pull request Jan 12, 2025
…ython#125730)

Adds `make ci` target for use in CI and keeping `make test` for the local development.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants