Skip to content

Commit

Permalink
Support relative imports in deeply nested tests
Browse files Browse the repository at this point in the history
  • Loading branch information
vkarak committed Dec 2, 2024
1 parent 2e3dee8 commit 670ac2f
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 10 deletions.
29 changes: 20 additions & 9 deletions reframe/frontend/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,17 +193,28 @@ def load_from_file(self, filename, force=False):

try:
dirname = os.path.dirname(filename)
with osext.change_dir(dirname):
with util.temp_sys_path(dirname):
if os.path.exists(os.path.join(dirname, '__init__.py')):
# If the containing directory is a package,
# import it, too.
parent = util.import_module_from_file(dirname).__name__
else:
parent = None

# Load all parent modules of test file
parents = []
while os.path.exists(os.path.join(dirname, '__init__.py')):
parents.append(os.path.join(dirname))
dirname = os.path.split(dirname)[0]

parent_module = None
for pdir in reversed(parents):
with osext.change_dir(pdir):
with util.temp_sys_path(pdir):
package_path = os.path.join(pdir, '__init__.py')
parent_module = util.import_module_from_file(
package_path, parent=parent_module
).__name__

# Now load the actual test file
with osext.change_dir(pdir):
with util.temp_sys_path(pdir):
return self.load_from_module(
util.import_module_from_file(filename, force, parent)
util.import_module_from_file(filename, force,
parent_module)
)
except Exception:
exc_info = sys.exc_info()
Expand Down
Empty file.
17 changes: 17 additions & 0 deletions unittests/resources/checks_unlisted/testlib/nested/dummy.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Copyright 2016-2024 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
# ReFrame Project Developers. See the top-level LICENSE file for details.
#
# SPDX-License-Identifier: BSD-3-Clause

import reframe as rfm
import reframe.utility.sanity as sn
from ..utility import dummy_fixture


@rfm.simple_test
class dummy_test(rfm.RunOnlyRegressionTest):
valid_systems = ['*']
valid_prog_environs = ['*']
executable = 'true'
sanity_patterns = sn.assert_true(1)
dummy = fixture(dummy_fixture)
2 changes: 1 addition & 1 deletion unittests/resources/checks_unlisted/testlib/simple.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class simple_echo_check(rfm.RunOnlyRegressionTest, pin_prefix=True):
executable = 'echo'
executable_opts = ['Hello']
message = variable(str, value='World')
dummy = fixture(dummy_fixture, scope='environment')
dummy = fixture(dummy_fixture)

@run_before('run')
def set_executable_opts(self):
Expand Down
6 changes: 6 additions & 0 deletions unittests/test_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,9 @@ def test_relative_import_outside_rfm_prefix(loader, tmp_path):
)
tests = loader.load_from_file(str(tmp_path / 'testlib' / 'simple.py'))
assert len(tests) == 2

# Test nested library tests
tests = loader.load_from_file(
str(tmp_path / 'testlib' / 'nested' / 'dummy.py')
)
assert len(tests) == 2

0 comments on commit 670ac2f

Please sign in to comment.