Skip to content

[bugfix] Enforce override of hooks with the same name #2436

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 3 commits into from
Feb 21, 2022
Merged

[bugfix] Enforce override of hooks with the same name #2436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f269553
Enforce hook overriding defined in different stages
Feb 18, 2022
a9b68c4
Code style fixes
Feb 20, 2022
2e71df2
Merge branch 'master' into bugfix/hook_override_diff_stages
Feb 20, 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
5 changes: 4 additions & 1 deletion reframe/core/hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,10 @@ def add(self, v):
'''

if hasattr(v, '_rfm_attach'):
self.__hooks.add(Hook(v))
# Always override hooks with the same name
h = Hook(v)
self.__hooks.discard(h)
self.__hooks.add(h)
elif hasattr(v, '_rfm_resolve_deps'):
v._rfm_attach = ['post_setup']
self.__hooks.add(Hook(v))
Expand Down
15 changes: 15 additions & 0 deletions unittests/test_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,21 @@ def y(self):
assert test.foo == 10


def test_overriden_hook_different_stages(HelloTest, local_exec_ctx):
@test_util.custom_prefix('unittests/resources/checks')
class MyTest(HelloTest):
@run_after('init')
def foo(self):
pass

@run_after('setup')
def foo(self):
pass

test = MyTest()
assert test.pipeline_hooks() == {'post_setup': [MyTest.foo]}


def test_disabled_hooks(HelloTest, local_exec_ctx):
@test_util.custom_prefix('unittests/resources/checks')
class BaseTest(HelloTest):
Expand Down