DM-11514: Fix a race condition in tests under pytest-xdist #273
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
timj
force-pushed
the
tickets/DM-11514-afw-xdist
branch
from
78cf4c1
to
5b8d9ea
Compare
|
@PaulPrice can you take a look at this for me please? Should be fairly non-controversial. |
PaulPrice
approved these changes
Aug 18, 2017
tests/test_apCorrMap.py
Outdated
| @@ -109,7 +109,7 @@ def testPersistence(self): | |||
|
|
|||
| def testExposurePersistence(self): | |||
| """Test that the ApCorrMap is saved with an Exposure""" | |||
| filename = "testApCorrMap.fits" | |||
| filename = "testApCorrMap-exposure.fits" | |||
There was a problem hiding this comment.
I suggest using:
with lsst.utils.tests.getTempFilePath(".fits") as filename:
That gets you automatic cleanup, and is more immune to cargo culting because it chooses a name based on the test.
Ditto in testExposureRecordPersistence.
tests/test_sourceMatch.py
Outdated
| @@ -181,6 +181,7 @@ def testPhotometricCalib(self): | |||
| s.setDec(dec * afwGeom.degrees) | |||
| s.set(self.table.getPsfFluxKey(), psfMags[band]) | |||
|
|
|||
| ifd.close() | |||
There was a problem hiding this comment.
Is it worth using the context manager? This is exactly what it's for.
with open(os.path.join(afwdataDir, "CFHT", "D2", "sdss.dat"), "r") as ifd:
allLines = ifd.readlines()
....
for line in allLines:
Ditto below.
There was a problem hiding this comment.
I'm happy to do that. The little Robert voice in my head was wondering if the big indenting diff was worth it.
There was a problem hiding this comment.
He's in my head too, which is why it was just a suggestion.
I slightly lean towards using the context manager, but it's up to you.
pytest can result in tests from the same class running in parallel, leading to a race where one test writes the file and the other test removes it before it can be read. The simplest solution is to use distinct file names for each of the tests.
The latter is deprecated in python3
The latter is deprecated in python3
Failing to do this results in a resource warning.
This fixes a resource warning.
timj
force-pushed
the
tickets/DM-11514-afw-xdist
branch
from
785f983
to
1108928
Compare
Without a third argument the line number reported by the deprecation warnings is the line number of the warning itself. This is not useful to a developer trying to determine which method was deprecated. This changes the situation so that the caller line number is reported by setting stacklevel=2.
timj
force-pushed
the
tickets/DM-11514-afw-xdist
branch
from
1108928
to
1e68ab8
Compare
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.
Also fix some deprecation warnings and use of AFW_DIR.