Skip to content

Reset current directory after test completion #34

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.

Sign up for GitHub

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
islas merged 2 commits into from
Jan 9, 2025
Merged

Reset current directory after test completion #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f1b62a
Use common return to always stash and pop current dir
islas Jan 6, 2025
7d22379
Add some logging for mapped alt dirs
islas Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions .ci/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,12 @@ def runMultitest( self, tests ) :
for testIdx, opt in enumerate( individualTestOpts ) :
opt.testsConfig = testDirs[testIdx] + "/" + os.path.basename( self.globalOpts_.testsConfig )

if testDirs :
self.log_push()
for testIdx, opt in enumerate( individualTestOpts ) :
self.log( "Test [{test}] will run {config} from {cwd}".format( test=opt.tests[0], config=opt.testsConfig, cwd=os.getcwd() ) )
self.log_pop()

self.log_pop()

self.log( "Spawning process pool of size {0} to perform {1} tests".format( self.globalOpts_.pool, len(tests) ) )
Expand Down Expand Up @@ -432,6 +438,10 @@ def runMultitest( self, tests ) :

# main entry point for testing
def run( self, tests ) :
currentDir = os.getcwd()
self.log( "Storing current working directory [{cwd}]".format( cwd=currentDir ) )
self.log( " Will return to this directory at the end of testing" )

for test in tests :
if test not in self.tests_.keys() :
msg = "Error: no test named '{0}'".format( test )
Expand All @@ -443,18 +453,23 @@ def run( self, tests ) :
self.setWorkingDirectory()

# Let joining steps into a single HPC job take precedence
success = True
logs = []
if self.globalOpts_.forceSingle :
success = True
logs = []
for test in tests :
success = success and self.tests_[ test ].run()
logs.append( self.tests_[ test ].logfile_ )
return success, logs
else :
if hasattr( self.globalOpts_, 'joinHPC' ) :
return self.runHPCJoin( tests )
success, logs = self.runHPCJoin( tests )
else :
return self.runMultitest( tests )
success, logs = self.runMultitest( tests )

# Popping back to old cwd
os.chdir( currentDir )
return success, logs

# A separated helper function to wrap this in a callable format
def runSuite( options ) :
Expand Down
Loading