GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — gh-93649: Split tracemalloc tests from _testcapimodule.c by erlend-aasland · Pull Request #99551 · python/cpython

Conversation

erlend-aasland commented Nov 16, 2022 •

edited by bedevere-bot

Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link

Copy Markdown

Contributor

Also split memory tests from Lib/test/test_capi/test_misc.py

Issue: Split up _testcapimodule.c #93649

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

erlend-aasland added 2 commits

November 16, 2022 23:01


          pythongh-93649: Split tracemalloc tests from _testcapimodule.c

5de1dc4


          Split memory tests from Lib/test/test_capi/test_misc.py

657eff1

erlend-aasland requested review from sobolevn and vstinner

November 16, 2022 22:03

bedevere-bot added the awaiting core review label

Nov 16, 2022

erlend-aasland changed the title ~~split testcapi/tracemalloc~~ gh-93649: Split tracemalloc tests from _testcapimodule.c

Nov 16, 2022

bedevere-bot mentioned this pull request

Nov 16, 2022

Split up _testcapimodule.c #93649

Open

erlend-aasland added the skip news label

Nov 16, 2022

sobolevn approved these changes

Nov 16, 2022

View reviewed changes

sobolevn left a comment

Copy link

Copy Markdown

Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

I will have so many merge conflicts in my C coverage PRs, ahaha 🙈

Thanks for working on this!

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

erlend-aasland reacted with laugh emoji

erlend-aasland reacted with heart emoji

All reactions

😄 1 reaction
❤️ 1 reaction

vstinner approved these changes

Nov 16, 2022

View reviewed changes

vstinner left a comment

Copy link

Copy Markdown

Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

LGTM.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

erlend-aasland reacted with hooray emoji

All reactions

🎉 1 reaction

bedevere-bot added awaiting merge and removed awaiting core review labels

Nov 16, 2022

ezio-melotti reviewed

Nov 16, 2022

View reviewed changes

ezio-melotti left a comment

Copy link

Copy Markdown

Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

The splits don't seem to preserve history.
For test_mem.py it should be possible to preserve it since it's a new file. For mem.c, I think git is supposed to figure it out on its own since the code have been moved but no files have been created. Maybe moving the code in a commit on its own will work?

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

erlend-aasland commented Nov 17, 2022

Copy link

Copy Markdown

Contributor Author

The splits don't seem to preserve history. For test_mem.py it should be possible to preserve it since it's a new file. For mem.c, I think git is supposed to figure it out on its own since the code have been moved but no files have been created. Maybe moving the code in a commit on its own will work?

Tests with various git log commands:

$ git log --oneline --follow -S hook_malloc Modules | wc -l
4

OTOH, git log -L seems to have problems, but that command does not work with --follow:

$ git log --oneline -L:hook_malloc:Modules/_testcapi/mem.c | wc -l
1

Maybe moving the code in a commit on its own will work?

Possibly, but I won't bet money on it since the commits are squashed upon merge anyway; previous move operations in Lib/test have worked swell (and there's been a lot of that; Serhiy was busy with test organization fairly recently). IMO reorganizing the code like this has far more benefits than disadvantages, since the resulting smaller files are easier to read, understand, and maintain, which again makes it easier to fix bugs.

ezio-melotti reacted with thumbs up emoji

All reactions

👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

erlend-aasland added 2 commits

November 17, 2022 10:23


          Merge branch 'main' into split-testcapi/tracemalloc

752b41b


          Merge branch 'main' into split-testcapi/tracemalloc

d2a4e42

vstinner approved these changes

Nov 22, 2022

View reviewed changes

vstinner left a comment

Copy link

Copy Markdown

Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

LGTM.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

erlend-aasland reacted with hooray emoji

All reactions

🎉 1 reaction

Comment thread

Lib/test/test_capi/test_mem.py Resolved

Uh oh!

There was an error while loading. Please reload this page.


          Address review: whitespace lint

e88f1e1

kumaraditya303 approved these changes

Dec 17, 2022

View reviewed changes

kumaraditya303 left a comment

Copy link

Copy Markdown

Contributor

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

LGTM

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

erlend-aasland reacted with hooray emoji

All reactions

🎉 1 reaction

erlend-aasland merged commit 2b38a9a into python:main

Dec 17, 2022

bedevere-bot removed the awaiting merge label

Dec 17, 2022

erlend-aasland deleted the split-testcapi/tracemalloc branch

December 17, 2022 18:03

shihai1991 added a commit to shihai1991/cpython that referenced this pull request

Dec 18, 2022


          Merge remote-tracking branch 'origin/main' into bpo_34697

* origin/main: (1306 commits)
  Correct CVE-2020-10735 documentation (python#100306)
  pythongh-100272: Fix JSON serialization of OrderedDict (pythonGH-100273)
  pythongh-93649: Split tracemalloc tests from _testcapimodule.c (python#99551)
  Docs: Use `PY_VERSION_HEX` for version comparison (python#100179)
  pythongh-97909: Fix markup for `PyMethodDef` members (python#100089)
  pythongh-99240: Reset pointer to NULL when the pointed memory is freed in argument parsing (python#99890)
  pythongh-99240: Reset pointer to NULL when the pointed memory is freed in argument parsing (python#99890)
  pythonGH-98831: Add DECREF_INPUTS(), expanding to DECREF() each stack input (python#100205)
  pythongh-78707: deprecate passing >1 argument to `PurePath.[is_]relative_to()` (pythonGH-94469)
  pythongh-99540: Constant hash for _PyNone_Type to aid reproducibility (pythonGH-99541)
  pythongh-100039: enhance __signature__ to work with str and callables (pythonGH-100168)
  pythongh-99830: asyncio: Document returns of remove_{reader,writer} (python#100302)
  "Compound statement" docs: Fix with-statement step indexing (python#100286)
  pythonGH-90043: Handle NaNs in COMPARE_OP_FLOAT_JUMP (pythonGH-100278)
  Improve stats presentation for calls. (pythonGH-100274)
  Better stats for `LOAD_ATTR` and `STORE_ATTR` (pythonGH-100295)
  pythongh-81057: Move the Cached Parser Dummy Name to _PyRuntimeState (python#100277)
  Document that zipfile's pwd parameter is a `bytes` object (python#100209)
  pythongh-99767: mark `PyTypeObject.tp_watched` as internal use only in table (python#100271)
  Fix typo in introduction.rst (python#100266)
  ...

carljm added a commit to carljm/cpython that referenced this pull request

Dec 19, 2022


          Merge branch 'main' into fastmock

a9af20a

* main:
  pythongh-89727: Fix os.walk RecursionError on deep trees (python#99803)
  Docs: Don't upload CI artifacts (python#100330)
  pythongh-94912: Added marker for non-standard coroutine function detection (python#99247)
  Correct CVE-2020-10735 documentation (python#100306)
  pythongh-100272: Fix JSON serialization of OrderedDict (pythonGH-100273)
  pythongh-93649: Split tracemalloc tests from _testcapimodule.c (python#99551)
  Docs: Use `PY_VERSION_HEX` for version comparison (python#100179)
  pythongh-97909: Fix markup for `PyMethodDef` members (python#100089)
  pythongh-99240: Reset pointer to NULL when the pointed memory is freed in argument parsing (python#99890)
  pythongh-99240: Reset pointer to NULL when the pointed memory is freed in argument parsing (python#99890)
  pythonGH-98831: Add DECREF_INPUTS(), expanding to DECREF() each stack input (python#100205)
  pythongh-78707: deprecate passing >1 argument to `PurePath.[is_]relative_to()` (pythonGH-94469)

Reviewers

ezio-melotti

ezio-melotti left review comments

vstinner

vstinner approved these changes

sobolevn

sobolevn approved these changes

kumaraditya303

kumaraditya303 approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

6 participants

Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.

GeezerVison

Conversation

erlend-aasland commented Nov 16, 2022 • edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sobolevn left a comment

Choose a reason for hiding this comment

Uh oh!

vstinner left a comment

Choose a reason for hiding this comment

Uh oh!

ezio-melotti left a comment

Choose a reason for hiding this comment

Uh oh!

erlend-aasland commented Nov 17, 2022

Uh oh!

vstinner left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kumaraditya303 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

erlend-aasland commented Nov 16, 2022 •

edited by bedevere-bot

Loading

Uh oh!

There was an error while loading. Please reload this page.