Skip to content

[bugfix] Properly set display name of tests with join fixtures #2705

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 2 commits into from
Dec 12, 2022
Merged

[bugfix] Properly set display name of tests with join fixtures #2705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a28a5d0
Properly set display name of tests with join fixtures
vkarak Dec 6, 2022
66490bb
Merge branch 'master' into bugfix/display-name-fixtures
vkarak Dec 12, 2022
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
3 changes: 2 additions & 1 deletion reframe/core/meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,8 @@ def __call__(cls, *args, **kwargs):
# the init phase
varinfo = cls.get_variant_info(variant_num, recurse=True)
for fname, finfo in varinfo['fixtures'].items():
if not isinstance(finfo, tuple):
fixt = cls.fixture_space[fname]
if fixt.action != 'join':
setattr(obj, fname, fixtures.FixtureProxy(finfo))

obj.__init__(*args, **kwargs)
Expand Down
5 changes: 2 additions & 3 deletions reframe/core/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,11 +1146,10 @@ def _format_params(cls, info, prefix=' %'):
name += f'{prefix}{p}={format_fn(v)}'

for f, v in info['fixtures'].items():
if isinstance(v, tuple):
# This is join fixture
fixt = cls.fixture_space[f]
if fixt.action == 'join':
continue

fixt = cls.fixture_space[f]
name += _format_params(fixt.cls, v, f'{prefix}{f}.')

# Append any variables set for the fixtures
Expand Down
2 changes: 0 additions & 2 deletions unittests/test_fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ class FooB(rfm.RegressionTest):

class Bar(rfm.RegressionTest):
f = fixture(FooB, variables={'z': 5})
w = fixture(FooB, action='join')

valid_systems = ['*']
valid_prog_environs = ['*']
Expand All @@ -211,7 +210,6 @@ class Bar(rfm.RegressionTest):
def early_access(self):
assert self.f.foo.x == 1
assert self.f.y == 2
assert self.w.y == 2

Bar(variant_num=0)

Expand Down