Skip to content

bpo-33752: Fix a file leak in test_dbm. #7376

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 2 commits into from
Jun 5, 2018

Conversation

serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Jun 4, 2018

With addCleanup() f.close() was executed after tearDown().

https://bugs.python.org/issue33752

With addCleanup() f.close() was executed after tearDown().
@@ -75,10 +75,9 @@ def test_anydbm_creation(self):
def test_anydbm_creation_n_file_exists_with_invalid_contents(self):
# create an empty file
test.support.create_empty_file(_fname)

f = dbm.open(_fname, 'n')
Copy link
Member

Choose a reason for hiding this comment

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

Use maybe: try/finally, just in case.

Copy link
Member Author

Choose a reason for hiding this comment

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

There are 11 other calls of close() without try/finally. I had doubts about adding try/finally in all these cases. Maybe in a separate commit.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe you can use "with f:" if you don't want to use try/finally :-)

Copy link
Member Author

Choose a reason for hiding this comment

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

It is not supported in 2.7. On other side, this PR will be not applied to 2.7, because test_dbm is rudimentary in 2.7.

@@ -75,10 +75,9 @@ def test_anydbm_creation(self):
def test_anydbm_creation_n_file_exists_with_invalid_contents(self):
# create an empty file
test.support.create_empty_file(_fname)
Copy link
Member

Choose a reason for hiding this comment

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

Please keep the empty line. IMHO it helps for the readability.

Copy link
Member Author

Choose a reason for hiding this comment

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

This test is short (just 4 lines), and no other test method contains an empty line inside. Having an empty line that splits this short test rather adds a false signal that attract an attention to an insignificant detail.

But if you still think that it is worth to restore an empty line, I'll do 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.

@serhiy-storchaka serhiy-storchaka merged commit 6592d7f into python:master Jun 5, 2018
@miss-islington
Copy link
Contributor

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒⛏🤖

@serhiy-storchaka serhiy-storchaka deleted the test_dbm-file-leak branch June 5, 2018 13:03
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 5, 2018
With addCleanup() f.close() was executed after tearDown().
(cherry picked from commit 6592d7f)

Co-authored-by: Serhiy Storchaka <[email protected]>
@bedevere-bot
Copy link

GH-7429 is a backport of this pull request to the 3.6 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 5, 2018
With addCleanup() f.close() was executed after tearDown().
(cherry picked from commit 6592d7f)

Co-authored-by: Serhiy Storchaka <[email protected]>
@bedevere-bot
Copy link

GH-7430 is a backport of this pull request to the 3.7 branch.

miss-islington added a commit that referenced this pull request Jun 5, 2018
With addCleanup() f.close() was executed after tearDown().
(cherry picked from commit 6592d7f)

Co-authored-by: Serhiy Storchaka <[email protected]>
miss-islington added a commit that referenced this pull request Jun 5, 2018
With addCleanup() f.close() was executed after tearDown().
(cherry picked from commit 6592d7f)

Co-authored-by: Serhiy Storchaka <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip news tests Tests in the Lib/test dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants