gh-81005: Refactor str tests to reflect that str and unicode are merged in Python 3 by asqui · Pull Request #13172 · python/cpython

asqui · 2019-05-07T20:04:35Z

Various cleanup and refactoring of unit tests for string-like types.
See https://bugs.python.org/issue36824 and/or individual commit messages for more details.

I haven't done the "Promote tests from the current UnicodeTest class to CommonTest" portion yet, but I'm running out of sprint time so I wanted to submit what I have.

I believe these changes are suitable for merge to master, but keen to hear feedback :-)

https://bugs.python.org/issue36824

Issue: Refactor str tests to reflect that str and unicode are merged in Python 3 #81005

(to reflect the type that is now being tested)

(The comment for this mixin class says # additional tests that only work for # stringlike objects, i.e. str, UserString but in the absence of `unicode` the `CommonTest` class is also only used for these two types now, so no need for the distinction.)

communicate its purpose, and to disambiguate it from the more general `BaseTest` class, which covers behaviours shared with the `bytes` and `bytesarray` types.

(Seems to date back to the first introduction of this code, in 2003!)

non-str types. Back in 2007 there was a change to allow str.join() to convert non-str values automatically, but this is no longer the case.

raising TypeError, so BadSeq1 and the associated check seem to be redundant. This is the existing check, in test_join(): self.assertRaises(TypeError, '.'.join, ['a', 'b', 3]) (Unless there is some specific difference we're testing by supplying a custom sequence, BadSeq1, rather than a plain list?) - Define BadSeq2 closer to its only usage, and give it a more meaningful name. (Previously this type was referenced from multiple locations but this is no longer the case.)

asqui · 2019-05-08T14:30:16Z

As this is a test-only change with no external visibility, I don' think it needs a NEWS entry. Should the "skip news" label be applied to this PR?

jdemeyer

The changes look good to me. I agree with the skip news.

iritkatriel

This has merge conflicts now,.

bedevere-bot · 2022-11-26T23:03:44Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

furkanonder · 2023-05-11T15:07:42Z

@asqui Could you resolve the conflicts?

asqui · 2023-05-13T16:32:15Z

Sure! I'm AFK for the next few days but I'll take a look when I'm back next week.

…po-36824

ghost · 2023-05-18T07:20:21Z

All commit authors signed the Contributor License Agreement.

asqui · 2023-05-18T07:30:54Z

Changes to the renamed file merged in cleanly with absolutely no conflicts. (I was surprised given the age of this PR so did some sanity checks and it all looks good.)

CLA signed (again; was there a change to the CLA that required everyone to re-sign?)

I think this is good to merge now? (Needs the Skip News label.)

Merge conflicts resolved

arhadthedev · 2023-05-18T08:13:30Z

(Needs the Skip News label.)

I think that something like String tests are modified to reflect that ``str`` and ``unicode`` are merged in Python 3. Patch by Daniel Fortunov. is indeed required here. The list of tests got changed so whoever runs them periodically to build comparison graphs needs to be aware.

/cc @AlexWaygood (to check whether I apply #104570 (comment) correctly)

AlexWaygood · 2023-05-18T08:17:58Z

(Needs the Skip News label.)
I think that something like String tests are modified to reflect thatstrandunicodeare merged in Python 3. Patch by Daniel Fortunov. is indeed required here. The list of tests got changed so whoever runs them periodically to build comparison graphs needs to be aware.
/cc @AlexWaygood (to check whether I apply #104570 (comment) correctly)

Good call @arhadthedev. Changes to our test suite often don't need NEWS entries, as they don't have much impact on end users. But something as significant as renaming a whole test file probably does need a NEWS entry, as it will affect the invocation people will need to use to run the tests.

asqui · 2023-05-19T07:09:00Z

Added the suggested NEWS entry.

(This is my first time using blurb so hopefully I did it correctly!)

asqui · 2023-05-19T07:44:03Z

Hmm looks like I should have used the GH issue number for the bpo-imported issue that this PR is fixing (I mistakenly put the number for this PR itself)

I'm AFK again for the next few days so won't be able to fix this until next week.

I guess all is needed is to rename the news file to feature the correct number - I don't know of any way to do that through GitHub.com without my laptop.

hugovk · 2023-05-19T07:56:41Z

I've renamed the NEWS file to use the GitHub issue number.

hugovk · 2023-05-19T10:27:17Z

And I've opened python/core-workflow#504 to suggest more validation in blurb.

hugovk · 2023-05-23T14:11:33Z

Thank you for the PR and for your patience!

asqui · 2023-05-23T21:53:12Z

Yay, merged at last! Thanks for the reviews and help along the way 😄

asqui added 6 commits May 7, 2019 14:44

- Rename test_unicode.py to test_str.py, and UnicodeTest to StrTest
6d9900c
(to reflect the type that is now being tested)

- Rename CommonTest to StringLikeTest, in order to better
731890e
communicate its purpose, and to disambiguate it from the more general `BaseTest` class, which covers behaviours shared with the `bytes` and `bytesarray` types.

- Fix comments which refer to fixtesttype() when they mean fixtype()
e8a401f
(Seems to date back to the first introduction of this code, in 2003!)

- Reinstate check that str.join() raises TypeError when given input with
76c4542
non-str types. Back in 2007 there was a change to allow str.join() to convert non-str values automatically, but this is no longer the case.

the-knights-who-say-ni added the CLA signed label May 7, 2019

bedevere-bot added the awaiting review label May 7, 2019

jdemeyer approved these changes May 16, 2019
View reviewed changes

bedevere-bot added awaiting core review and removed awaiting review labels May 16, 2019

csabella requested a review from serhiy-storchaka May 22, 2020 21:54

ezio-melotti removed the CLA signed label Jul 13, 2022

iritkatriel previously requested changes Nov 26, 2022
View reviewed changes

bedevere-bot removed the awaiting core review label Nov 26, 2022

bedevere-bot added the awaiting changes label Nov 26, 2022

Merge remote-tracking branch 'cpython/main' into str-tests-refactor-b…
4552eee
…po-36824

bedevere-bot added awaiting core review and removed awaiting changes labels May 18, 2023

arhadthedev changed the title ~~bpo-36824: Refactor str tests to reflect that str and unicode are merged in Python 3~~gh-81005: Refactor str tests to reflect that str and unicode are merged in Python 3May 18, 2023

Add NEWS entry
bfb4e8a

Rename NEWS file
130ece2

hugovk approved these changes May 19, 2023
View reviewed changes

bedevere-bot added awaiting merge and removed awaiting core review labels May 19, 2023

hugovk mentioned this pull request May 19, 2023
Blurb: validate GitHub issue number python/core-workflow#504
Closed

hugovk merged commit ddb1485 into python:mainMay 23, 2023

bedevere-bot removed the awaiting merge label May 23, 2023

asquimannequin mentioned this pull request May 18, 2023
Refactor str tests to reflect that str and unicode are merged in Python 3 #81005
Closed

asqui deleted the str-tests-refactor-bpo-36824 branch May 23, 2023 21:48

AlexWaygood mentioned this pull request Oct 3, 2023
test_unicode always fails during a PGO-optimised build (because it does not exist) #110276
Closed

Uh oh!

Uh oh!

Conversation

asqui commented May 7, 2019• edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

asqui commented May 8, 2019

Uh oh!

jdemeyer left a comment

Choose a reason for hiding this comment

Uh oh!

iritkatriel left a comment

Choose a reason for hiding this comment

Uh oh!

bedevere-bot commented Nov 26, 2022

Uh oh!

furkanonder commented May 11, 2023

Uh oh!

asqui commented May 13, 2023

Uh oh!

ghost commented May 18, 2023• edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

asqui commented May 18, 2023

Uh oh!

arhadthedev commented May 18, 2023

Uh oh!

AlexWaygood commented May 18, 2023

Uh oh!

asqui commented May 19, 2023

Uh oh!

asqui commented May 19, 2023

Uh oh!

hugovk commented May 19, 2023

Uh oh!

hugovk commented May 19, 2023

Uh oh!

hugovk commented May 23, 2023

Uh oh!

asqui commented May 23, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

asqui commented May 7, 2019•
edited by bedevere-bot
Loading

ghost commented May 18, 2023•
edited by ghost
Loading