TestCase : Temp directory access improvements #6204
Merged
+22
−11
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
ericmehl
force-pushed
the
improveTearDown
branch
from
027810e to
2df5d22
Compare
johnhaddon
reviewed
Jan 13, 2025
python/GafferTest/TestCase.py
Outdated
| if self.__temporaryDirectory is not None : | ||
| for root, dirs, files in os.walk( self.temporaryDirectory() ) : |
There was a problem hiding this comment.
Minor quibble - let's use __temporaryDirectory here rather than temporaryDirectory(), to match the other uses in this block. We're saying "the directory we made it earlier" rather than "make the directory".
There was a problem hiding this comment.
Sounds good, fixed in 2d73134
python/GafferTest/TestCase.py
Outdated
| @@ -115,6 +115,9 @@ def tearDown( self ) : | |||
| IECore.RefCounted.collectGarbage() | |||
|
|
|||
| if self.__temporaryDirectory is not None : | |||
| if os.name == "nt" : | |||
| subprocess.check_call( [ "icacls", self.temporaryDirectory(), "/grant", "Users:(OI)(CI)(W)" ] ) | |||
ericmehl
force-pushed
the
improveTearDown
branch
from
2df5d22 to
394d3fe
Compare
|
Great! Fixed up, squashed down and merging. |
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.
This improves a few things with
TestCase.tearDown:tearDown(). I did a double check to make sure the call toicaclsdoesn't increase the overall test times too much. It does increase the time relatively, but when testingGafferSceneTest, it was adding up to only a bit over half a second.GafferImage.CatalogueTest.testNonWritableDirectoryon Windows because it was thought Windows couldn't make a directory truly read-only. Using extended permissions allows that, so this test can be adapted and enabled.Checklist