Skip to content

Conversation

@gkirchou
Copy link
Contributor

@gkirchou gkirchou commented Dec 2, 2025

Test with:

./configure --enable-optimizations --with-lto
make -s -j $(nproc);

@bedevere-app

This comment was marked as resolved.

Copy link
Member

@StanFromIreland StanFromIreland left a comment

Choose a reason for hiding this comment

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

IMO making the tests locale independent would be a better solution than this (i.e. just replace %c with our desired order).

@bedevere-app

This comment was marked as resolved.

@gkirchou gkirchou changed the title gh-129483: Force TestLocalTimeDisambiguation to run on LC_ALL=C gh-129483: Clarify TestLocalTimeDisambiguation's time format Dec 3, 2025
@gkirchou
Copy link
Contributor Author

gkirchou commented Dec 3, 2025

IMO making the tests locale independent would be a better solution than this (i.e. just replace %c with our desired order).

Addressed

@StanFromIreland StanFromIreland changed the title gh-129483: Clarify TestLocalTimeDisambiguation's time format gh-129483: Make TestLocalTimeDisambiguation's time format locale independent Dec 3, 2025
Copy link
Member

@StanFromIreland StanFromIreland 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!

@python-cla-bot
Copy link

python-cla-bot bot commented Dec 3, 2025

All commit authors signed the Contributor License Agreement.

CLA signed

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

@pganssle pganssle merged commit 8392095 into python:main Dec 4, 2025
44 checks passed
@pganssle
Copy link
Member

pganssle commented Dec 4, 2025

This is failing in 3.13, right? So we should backport it? Anyone know how far back it is causing issues?

@vstinner vstinner added the needs backport to 3.14 bugs and security fixes label Dec 4, 2025
@miss-islington-app
Copy link

Thanks @gkirchou for the PR, and @pganssle for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Dec 4, 2025
…ale independent (pythonGH-142193)

* Change to update %c to the exact time format.

---------
(cherry picked from commit 8392095)

Co-authored-by: Kir Chou <148194051+gkirchou@users.noreply.github.com>
Co-authored-by: Kir Chou <note351@hotmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Dec 4, 2025

GH-142258 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Dec 4, 2025
@vstinner vstinner added the needs backport to 3.13 bugs and security fixes label Dec 4, 2025
@miss-islington-app
Copy link

Thanks @gkirchou for the PR, and @pganssle for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Dec 4, 2025
…ale independent (pythonGH-142193)

* Change to update %c to the exact time format.

---------
(cherry picked from commit 8392095)

Co-authored-by: Kir Chou <148194051+gkirchou@users.noreply.github.com>
Co-authored-by: Kir Chou <note351@hotmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Dec 4, 2025

GH-142259 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Dec 4, 2025
@vstinner
Copy link
Member

vstinner commented Dec 4, 2025

This is failing in 3.13, right? So we should backport it? Anyone know how far back it is causing issues?

Right, the issue was reported on Python 3.13.1. We should backport the change to 3.13 and 3.14 branches. Other branches no longer accept bugfixes.

vstinner pushed a commit that referenced this pull request Dec 4, 2025
…cale independent (GH-142193) (#142259)

gh-129483: Make `TestLocalTimeDisambiguation`'s time format locale independent (GH-142193)

* Change to update %c to the exact time format.

---------
(cherry picked from commit 8392095)

Co-authored-by: Kir Chou <148194051+gkirchou@users.noreply.github.com>
Co-authored-by: Kir Chou <note351@hotmail.com>
vstinner pushed a commit that referenced this pull request Dec 4, 2025
…cale independent (GH-142193) (#142258)

gh-129483: Make `TestLocalTimeDisambiguation`'s time format locale independent (GH-142193)

* Change to update %c to the exact time format.

---------
(cherry picked from commit 8392095)

Co-authored-by: Kir Chou <148194051+gkirchou@users.noreply.github.com>
Co-authored-by: Kir Chou <note351@hotmail.com>
@bedevere-bot
Copy link

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot s390x Fedora Stable LTO + PGO 3.13 (tier-3) has failed when building commit e68066e.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/#/builders/1633/builds/552) and take a look at the build logs.
  4. Check if the failure is related to this commit (e68066e) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/#/builders/1633/builds/552

Summary of the results of the build (if available):

Click to see traceback logs
remote: Enumerating objects: 5, done.        
remote: Counting objects:  20% (1/5)        
remote: Counting objects:  40% (2/5)        
remote: Counting objects:  60% (3/5)        
remote: Counting objects:  80% (4/5)        
remote: Counting objects: 100% (5/5)        
remote: Counting objects: 100% (5/5), done.        
remote: Total 5 (delta 4), reused 4 (delta 4), pack-reused 0 (from 0)        
From https://github.com/python/cpython
 * branch                    3.13       -> FETCH_HEAD
Note: switching to 'e68066eb0957f5cad8e8959ea8f3f681bfda0994'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at e68066eb095 [3.13] gh-129483: Make `TestLocalTimeDisambiguation`'s time format locale independent (GH-142193) (#142259)
Switched to and reset branch '3.13'

find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
make[2]: [Makefile:3127: clean-retain-profile] Error 1 (ignored)
In function ‘hashtable_key_from_2_strings’,
    inlined from ‘_extensions_cache_find_unlocked’ at Python/import.c:1264:17:
Python/import.c:1177:5: warning: ‘strncpy’ output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
 1177 |     strncpy(key, str1_data, str1_len);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Python/import.c:1163:27: note: length computed here
 1163 |     Py_ssize_t str1_len = strlen(str1_data);
      |                           ^~~~~~~~~~~~~~~~~
test_denial_of_service_prevented_int_to_str (test.test_int.IntStrDigitLimitsTests.test_denial_of_service_prevented_int_to_str)
Regression test: ensure we fail before performing O(N**2) work. ... ok
test_denial_of_service_prevented_str_to_int (test.test_int.IntStrDigitLimitsTests.test_denial_of_service_prevented_str_to_int)
Regression test: ensure we fail before performing O(N**2) work. ... ok
test_disabled_limit (test.test_int.IntStrDigitLimitsTests.test_disabled_limit) ... ok
test_int_from_other_bases (test.test_int.IntStrDigitLimitsTests.test_int_from_other_bases) ... ok
test_int_max_str_digits_is_per_interpreter (test.test_int.IntStrDigitLimitsTests.test_int_max_str_digits_is_per_interpreter) ... ok
test_max_str_digits (test.test_int.IntStrDigitLimitsTests.test_max_str_digits) ... ok
test_max_str_digits_edge_cases (test.test_int.IntStrDigitLimitsTests.test_max_str_digits_edge_cases)
Ignore the +/- sign and space padding. ... ok
test_power_of_two_bases_unlimited (test.test_int.IntStrDigitLimitsTests.test_power_of_two_bases_unlimited)
The limit does not apply to power of 2 bases. ... ok
test_sign_not_counted (test.test_int.IntStrDigitLimitsTests.test_sign_not_counted) ... ok
test_underscores_ignored (test.test_int.IntStrDigitLimitsTests.test_underscores_ignored) ... ok
test_denial_of_service_prevented_int_to_str (test.test_int.IntSubclassStrDigitLimitsTests.test_denial_of_service_prevented_int_to_str)
Regression test: ensure we fail before performing O(N**2) work. ... ok
test_denial_of_service_prevented_str_to_int (test.test_int.IntSubclassStrDigitLimitsTests.test_denial_of_service_prevented_str_to_int)
Regression test: ensure we fail before performing O(N**2) work. ... FAIL
test_disabled_limit (test.test_int.IntSubclassStrDigitLimitsTests.test_disabled_limit) ... ok
test_int_from_other_bases (test.test_int.IntSubclassStrDigitLimitsTests.test_int_from_other_bases) ... ok
test_int_max_str_digits_is_per_interpreter (test.test_int.IntSubclassStrDigitLimitsTests.test_int_max_str_digits_is_per_interpreter) ... ok
test_max_str_digits (test.test_int.IntSubclassStrDigitLimitsTests.test_max_str_digits) ... ok
test_max_str_digits_edge_cases (test.test_int.IntSubclassStrDigitLimitsTests.test_max_str_digits_edge_cases)
Ignore the +/- sign and space padding. ... ok
test_power_of_two_bases_unlimited (test.test_int.IntSubclassStrDigitLimitsTests.test_power_of_two_bases_unlimited)
The limit does not apply to power of 2 bases. ... ok
test_sign_not_counted (test.test_int.IntSubclassStrDigitLimitsTests.test_sign_not_counted) ... ok
test_underscores_ignored (test.test_int.IntSubclassStrDigitLimitsTests.test_underscores_ignored) ... ok
test_basic (test.test_int.IntTestCases.test_basic) ... ok
test_error_message (test.test_int.IntTestCases.test_error_message) ... ok
test_int_base_bad_types (test.test_int.IntTestCases.test_int_base_bad_types)
Not integer types are not valid bases; issue16772. ... ok
test_int_base_indexable (test.test_int.IntTestCases.test_int_base_indexable) ... ok
test_int_base_limits (test.test_int.IntTestCases.test_int_base_limits)
Testing the supported limits of the int() base parameter. ... ok
test_int_memoryview (test.test_int.IntTestCases.test_int_memoryview) ... ok
test_int_returns_int_subclass (test.test_int.IntTestCases.test_int_returns_int_subclass) ... ok
test_int_subclass_with_index (test.test_int.IntTestCases.test_int_subclass_with_index) ... ok
test_int_subclass_with_int (test.test_int.IntTestCases.test_int_subclass_with_int) ... ok
test_intconversion (test.test_int.IntTestCases.test_intconversion) ... ok
test_invalid_signs (test.test_int.IntTestCases.test_invalid_signs) ... ok
test_issue31619 (test.test_int.IntTestCases.test_issue31619) ... ok
test_keyword_args (test.test_int.IntTestCases.test_keyword_args) ... ok
test_no_args (test.test_int.IntTestCases.test_no_args) ... ok
test_non_numeric_input_types (test.test_int.IntTestCases.test_non_numeric_input_types) ... ok
test_small_ints (test.test_int.IntTestCases.test_small_ints) ... ok
test_string_float (test.test_int.IntTestCases.test_string_float) ... ok
test_underscores (test.test_int.IntTestCases.test_underscores) ... ok
test_unicode (test.test_int.IntTestCases.test_unicode) ... ok
test_pylong_int_divmod (test.test_int.PyLongModuleTests.test_pylong_int_divmod) ... ok
test_pylong_int_to_decimal (test.test_int.PyLongModuleTests.test_pylong_int_to_decimal) ... ok
test_pylong_int_to_decimal_2 (test.test_int.PyLongModuleTests.test_pylong_int_to_decimal_2) ... skipped "resource 'cpu' is not enabled"
test_pylong_misbehavior_error_path_from_str (test.test_int.PyLongModuleTests.test_pylong_misbehavior_error_path_from_str) ... ok
test_pylong_misbehavior_error_path_to_str (test.test_int.PyLongModuleTests.test_pylong_misbehavior_error_path_to_str) ... ok
test_pylong_roundtrip (test.test_int.PyLongModuleTests.test_pylong_roundtrip) ... ok
test_pylong_str_to_int (test.test_int.PyLongModuleTests.test_pylong_str_to_int) ... ok

======================================================================
FAIL: test_denial_of_service_prevented_str_to_int (test.test_int.IntSubclassStrDigitLimitsTests.test_denial_of_service_prevented_str_to_int)
Regression test: ensure we fail before performing O(N**2) work.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.13.cstratak-fedora-stable-s390x.lto-pgo/build/Lib/test/test_int.py", line 740, in test_denial_of_service_prevented_str_to_int
    self.assertLessEqual(sw_fail_extra_huge.seconds, sw_convert.seconds/2)
    ~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 0.09443029399999858 not less than or equal to 0.022935383500000128

----------------------------------------------------------------------
Ran 46 tests in 1.140s

FAILED (failures=1, skipped=1)
test test_int failed
make: *** [Makefile:906: profile-run-stamp] Error 2

StanFromIreland pushed a commit to StanFromIreland/cpython that referenced this pull request Dec 6, 2025
…ale independent (python#142193)

* Change to update %c to the exact time format.

---------

Co-authored-by: Kir Chou <note351@hotmail.com>
@gkirchou gkirchou deleted the gh-129483 branch December 8, 2025 04:52
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.

6 participants