Skip to content

consistent mode: fix worker's vardir calculation #389

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
merged 1 commit into from
May 17, 2023
Merged

consistent mode: fix worker's vardir calculation #389

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions lib/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,22 @@ def parse_reproduce_file(filepath):
return reproduce


def main_vardir():
"""
A 'var directory' term is used in two different meanings
across test-run.

There is the --vardir option, VARDIR environment variable and
/tmp/t default. Let's call this directory the 'main vardir'.

There are per worker subdirectories within the main vardir:
'ddd-suite-name'. Let's call such a directory worker's vardir.
"""
return os.path.realpath(Options().args.vardir)


def get_reproduce_file(worker_name):
main_vardir = os.path.realpath(Options().args.vardir)
reproduce_dir = os.path.join(main_vardir, 'reproduce')
reproduce_dir = os.path.join(main_vardir(), 'reproduce')
return os.path.join(reproduce_dir, '%s.list.yaml' % worker_name)


Expand Down Expand Up @@ -255,8 +268,7 @@ def __init__(self, suite, _id):
self.suite = suite
self.name = '%03d_%s' % (self.id, self.suite.suite_path)

main_vardir = self.suite.ini['vardir']
self.suite.ini['vardir'] = os.path.join(main_vardir, self.name)
self.suite.ini['vardir'] = os.path.join(main_vardir(), self.name)

self.reproduce_file = get_reproduce_file(self.name)
safe_makedirs(os.path.dirname(self.reproduce_file))
Expand Down