fix tests for pytest6.x, cherrypy/test/test_config.py::ConfigTests::testHandlerToolConfigOverride and cherrypy/test/test_caching.py::CacheTest::testGzipStaticCache #1897
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
webknjaz
reviewed
Jan 15, 2021
cherrypy/test/test_config.py
Outdated
| @@ -221,8 +221,9 @@ def testHandlerToolConfigOverride(self): | |||
| # the favicon in the page handler to be '../favicon.ico', | |||
| # but then overrode it in config to be './static/dirback.jpg'. | |||
| self.getPage('/favicon.ico') | |||
| self.assertBody(open(os.path.join(localDir, 'static/dirback.jpg'), | |||
| 'rb').read()) | |||
| testfile = open(os.path.join(localDir, 'static/dirback.jpg'),'rb') | |||
There was a problem hiding this comment.
This should use a CM (with) in order to guarantee that the file descriptor gets closed always.
webknjaz
reviewed
Jan 15, 2021
cherrypy/lib/__init__.py
Outdated
| @@ -70,6 +70,10 @@ def __next__(self): | |||
| raise StopIteration() | |||
| next = __next__ | |||
|
|
|||
| def __del__(self): | |||
| """Close input on descturct""" | |||
| self.input.close() | |||
There was a problem hiding this comment.
I guess this should follow the same "if hasattr" approach as above.
webknjaz
reviewed
Jan 15, 2021
cherrypy/lib/__init__.py
Outdated
| @@ -70,6 +70,10 @@ def __next__(self): | |||
| raise StopIteration() | |||
| next = __next__ | |||
|
|
|||
| def __del__(self): | |||
| """Close input on descturct""" | |||
There was a problem hiding this comment.
PEP257-compliant docstrings should end with a period.
There was a problem hiding this comment.
a16bitsysop
changed the title
webknjaz
reviewed
Jan 17, 2021
Comment on lines
+224
to
+225
| with open(os.path.join(localDir, 'static/dirback.jpg'), 'rb') as tf: | ||
| self.assertBody(tf.read()) |
There was a problem hiding this comment.
It'd probably be cleaner with pathlib API. But it doesn't matter now. Just something to keep in mind for the future.
|
I think I need to apply put ignores in the pytest config and then address the warnings one by one... Ref cherrypy/cheroot@3eebb80 |
webknjaz
added a commit
that referenced
this pull request
Jan 17, 2021
|
I'll rebase this PR meanwhile. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What kind of change does this PR introduce?
What is the related issue number (starting with
#)What is the current behavior? (You can also link to an open issue here)
What is the new behavior (if this is a feature change)?
Stops two test failures with pytest6.x
Other information:
Checklist:
and description in grammatically correct, complete sentences