DM-11607: Use mkdtemp in tests #61
Conversation
tests/testCameraMapper.py
Outdated
| import shutil | ||
|
|
||
| testDir = os.path.relpath(os.path.join(getPackageDir('obs_base'), 'tests')) | ||
| testDir = os.path.abspath(os.path.dirname(__file__)) |
There was a problem hiding this comment.
nit: We have called this ROOT in most other places. It would help to change that here so as not to confuse it with self.testDir, which is a temporary directory below this.
tests/testComposite.py
Outdated
| packageDir = getPackageDir('obs_base') | ||
| self.testData = os.path.join(packageDir, 'tests', 'genericAssembler') | ||
| self.tearDown() | ||
| self.testData = tempfile.mkdtemp(dir=ROOT, prefix='genericAssembler-') |
There was a problem hiding this comment.
it would be more consistent with other tests to use "TestCompositeTestCase" (the test class name) as the prefix.
tests/testComposite.py
Outdated
| @@ -379,8 +375,7 @@ class TestSubset(unittest.TestCase): | |||
| """A test case for composite object subset keyword.""" | |||
|
|
|||
| def setUp(self): | |||
| packageDir = getPackageDir('obs_base') | |||
| self.testData = os.path.join(packageDir, 'tests', 'compositeSubset') | |||
| self.testData = tempfile.mkdtemp(dir=ROOT, prefix='compositeSubset-') | |||
tests/testComposite.py
Outdated
| @@ -446,8 +441,7 @@ class TestInputOnly(unittest.TestCase): | |||
| """A test case for composite input keyword.""" | |||
|
|
|||
| def setUp(self): | |||
| packageDir = getPackageDir('obs_base') | |||
| self.testData = os.path.join(packageDir, 'tests', 'composite') | |||
| self.testData = tempfile.mkdtemp(dir=ROOT, prefix='composite-') | |||
tests/testDM-329.py
Outdated
|
|
||
| testDir = os.path.relpath(os.path.join(getPackageDir('obs_base'), 'tests')) | ||
| testDir = os.path.abspath(os.path.dirname(__file__)) |
tests/testFindParentMapper.py
Outdated
| packageDir = getPackageDir('obs_base') | ||
| self.testDir = os.path.join(packageDir, 'tests', 'findParentMapper') | ||
|
|
||
| self.testDir = tempfile.mkdtemp(dir=ROOT, prefix='findParentMapper-') |
There was a problem hiding this comment.
prefix -> "TestFindParentMapperV1Butler"
| dprefix = dprefix + '-' | ||
| tempDir = tempfile.mkdtemp(dir=ROOT, prefix=dprefix) | ||
| self.tempDirs[prefix] = tempDir | ||
| return tempDir |
There was a problem hiding this comment.
this feels complex to me; I think I would have created a top-level temp folder and called that self.testDir, and put the output roots for each test method into that folder. But this seems to work so I'm ok if you want to leave it.
There was a problem hiding this comment.
It seems clearer to me so I would like to keep it. I didn't want to create a bunch of temp directories that were not being used so I switched to a test only creating a temp directory when it really needed one. I think the real solution would be to add something to lsst.utils.tests to create a temp directory in a context manager.
Tests can be run in parallel from within a single test case, so temporary directories can not use a fixed name. Clean up to use proper temp directories. During this cleanup, getPackageDir is no longer used to be consistent within tests.
|
I've made the changes requested. I'll do a Jenkins run to test. |
This fixes the problem with races in pytest xdist.