[6/6] Use constants for commonly used test easyconfig folders, files and content by Flamefire · Pull Request #5251 · easybuilders/easybuild-framework

Flamefire · 2026-08-27T13:18:26Z

Followup to #5050

Split from #5203

boegel · 2026-09-03T17:35:19Z

@Flamefire needs rebase after merge of #5255

akesandgren · 2026-09-21T10:54:46Z

@Flamefire conflict to solve

Flamefire · 2026-09-22T08:40:35Z

Done, CI passed again :)

akesandgren · 2026-10-06T05:28:57Z

-        args = ['--search', 'nosuchsoftware-1.2.3.4.5']
-        self.assertRaisesRegex(SystemExit, 'MISSING_EASYCONFIG|4', self.eb_main, args,
+        self.assertRaisesRegex(SystemExit, 'MISSING_EASYCONFIG|4', self.eb_main,
+                               args + ['--search', 'nosuchsoftware-1.2.3.4.5'],


Strictly speaking --robot=... should not be part of args here so this one should probably be reverted

I would say this is a bug: every other subtest uses arg + [extra]
Turns out none of them required it: The setup-step sets robot-paths, so I removed args completely

akesandgren · 2026-10-06T05:32:09Z

-        test_ecs = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'easyconfigs', 'test_ecs')
+        test_ecs = TEST_ECS_DIR
        gzip_ec = os.path.join(test_ecs, 'g', 'gzip', 'gzip-1.5-foss-2018a.eb')


Why not go all the way here?

I missed those, not sure why.

akesandgren · 2026-10-06T05:35:31Z

-        test_ecs_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'easyconfigs', 'test_ecs')
+        test_ecs_path = TEST_ECS_DIR
        ecstmpdir = tempfile.mkdtemp(prefix='easybuild-easyconfigs-pkg-install-path')
        mkdir(os.path.join(ecstmpdir, 'easybuild'), parents=True)
        copy_dir(test_ecs_path, os.path.join(ecstmpdir, 'easybuild', 'easyconfigs'))


And why not all the way here too (and the rest of the test_ecs_path instances below)

akesandgren · 2026-10-06T05:41:07Z

+        test_dir = TEST_DIR
+        ec_file = os.path.join(TEST_ECS_DIR, 'f', 'foss', 'foss-2018a.eb')
+        os.environ['MODULEPATH'] = str(TEST_MODULES_DIR)
        args = [
            ec_file,
            '--robot=%s' % os.path.join(test_dir, 'easyconfigs'),


Why not all the way with test_dir?

akesandgren · 2026-10-06T05:42:12Z

Same here test_ecs_path -> TEST_ECS_DIR

akesandgren · 2026-10-06T05:47:53Z

@@ -5292,7 +5213,7 @@ def test_show_config(self):
            r"ignoreconfigfiles\s* \(E\) = %s" % ', '.join(os.environ['EASYBUILD_IGNORECONFIGFILES'].split(',')),
            r"installpath\s* \(E\) = " + os.path.join(self.test_prefix, 'tmp.*'),
            r"repositorypath\s* \(D\) = " + os.path.join(default_prefix, 'ebfiles_repo'),
-            r"robot-paths\s* \(E\) = " + os.path.join(test_dir, 'easyconfigs', 'test_ecs'),
+            rf"robot-paths\s* \(E\) = {TEST_ECS_DIR}",
            r"rpath\s* \(D\) = " + ('False' if get_os_type() == DARWIN else 'True'),
            r"sourcepath\s* \(E\) = " + os.path.join(test_dir, 'sandbox', 'sources'),
            r"sourcepath-data\s* \(E\) = " + os.path.join(test_dir, 'sandbox', 'data_sources'),


test_dir -> TEST_DIR

akesandgren · 2026-10-06T05:52:03Z

enough comments for this time... @Flamefire your turn :-)

Flamefire

I think I now caught all occurrences. And I found something new for me which greatly simplifies it even more:

Path("foo") / "bar" / "baz" == os.path.join("foo", "bar", "baz")
Path("foo/bar") / "baz" == os.path.join("foo", "bar", "baz")
Path("foo") / "bar/baz" == Path("foo") / Path("bar/baz") == os.path.join("foo", "bar", "baz")

Hence we can use strings with slash-separators wherever we use Path and save the ', ' or ' / ' "noise"

I can apply this simple S&R (sed -i "s|' / '|/|g") to the other 3 files to make it consistent here (separate commit) or whole separate PR.

Flamefire · 2026-10-06T17:17:10Z

-        args = ['--search', 'nosuchsoftware-1.2.3.4.5']
-        self.assertRaisesRegex(SystemExit, 'MISSING_EASYCONFIG|4', self.eb_main, args,
+        self.assertRaisesRegex(SystemExit, 'MISSING_EASYCONFIG|4', self.eb_main,
+                               args + ['--search', 'nosuchsoftware-1.2.3.4.5'],


I would say this is a bug: every other subtest uses arg + [extra]
Turns out none of them required it: The setup-step sets robot-paths, so I removed args completely

Flamefire · 2026-10-06T18:05:01Z

-        test_ecs = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'easyconfigs', 'test_ecs')
+        test_ecs = TEST_ECS_DIR
        gzip_ec = os.path.join(test_ecs, 'g', 'gzip', 'gzip-1.5-foss-2018a.eb')


I missed those, not sure why.

akesandgren · 2026-10-07T05:32:39Z

I think I now caught all occurrences. And I found something new for me which greatly simplifies it even more:

Path("foo") / "bar" / "baz" == os.path.join("foo", "bar", "baz")

Path("foo/bar") / "baz" == os.path.join("foo", "bar", "baz")

Path("foo") / "bar/baz" == Path("foo") / Path("bar/baz") == os.path.join("foo", "bar", "baz")

Hence we can use strings with slash-separators wherever we use Path and save the ', ' or ' / ' "noise"

I can apply this simple S&R (sed -i "s|' / '|/|g") to the other 3 files to make it consistent here (separate commit) or whole separate PR.

I think a separate PR is to be preferred here. These are difficult enough to review due to size.

akesandgren · 2026-10-07T05:33:29Z

But now there are some failed tests, like

  File "/tmp/runner/10f6800a31437f4ccc896db4bb2f21b83fee7e3b/lib/python3.6/site-packages/test/framework/options.py", line 509, in test_job
271
    check_args(['--debug'])
272
  File "/tmp/runner/10f6800a31437f4ccc896db4bb2f21b83fee7e3b/lib/python3.6/site-packages/test/framework/options.py", line 501, in check_args
273
    msgstrs = [(tweaked_eb_file, eb_file + try_opts)]
274
TypeError: unsupported operand type(s) for +: 'PosixPath' and 'str'

Flamefire · 2026-10-07T07:26:16Z

I couldn't run the tests on windows powershell yesterday so missed those. Fixed now

boegel · 2026-10-07T07:33:31Z

@Flamefire merge conflict to fix?

Flamefire · 2026-10-07T07:35:17Z

I think a separate PR is to be preferred here. These are difficult enough to review due to size.

Simplify multi-segment path concatenation in tests #5315

…and content

…ators instead of `os.path.join`

akesandgren

LGTM

akesandgren · 2026-10-07T10:54:52Z

Going in, thanks @Flamefire!

Flamefire mentioned this pull request Aug 27, 2026

Use constants for commonly used test easyconfig folders, files and content #5203

Merged

boegel added code cleanup tests labels Sep 1, 2026

Flamefire force-pushed the toy-and-test-dir-constants-6 branch from 6bb5e6a to 397961c Compare September 4, 2026 09:15

boegel added this to the next release (5.4.1?) milestone Sep 4, 2026

Flamefire force-pushed the toy-and-test-dir-constants-6 branch 4 times, most recently from 64a4141 to 107e815 Compare September 11, 2026 13:38

Flamefire force-pushed the toy-and-test-dir-constants-6 branch from 107e815 to bf3122b Compare September 21, 2026 11:42

Flamefire force-pushed the toy-and-test-dir-constants-6 branch 3 times, most recently from 3cf82b7 to bda983a Compare October 5, 2026 08:30

akesandgren reviewed Oct 6, 2026

View reviewed changes

Flamefire commented Oct 6, 2026

View reviewed changes

[6/6] Use constants for commonly used test easyconfig folders, files …

aed1d20

…and content

boegel modified the milestones: next release (5.4.1), 5.x Oct 7, 2026

Flamefire and others added 4 commits October 7, 2026 09:40

Remove superflous --robot in test_search

7293b76

Convert options test fully to path constants and using Path-join oper…

23cb8b7

…ators instead of `os.path.join`

Reduce verbosity of path-join in __init__.py

ae493f2

Fix string usage of Path instances

f720d30

Flamefire force-pushed the toy-and-test-dir-constants-6 branch from 8e9f2c6 to f720d30 Compare October 7, 2026 07:40

akesandgren approved these changes Oct 7, 2026

View reviewed changes

akesandgren merged commit 2f33d74 into easybuilders:develop Oct 7, 2026
41 checks passed

akesandgren modified the milestones: 5.x, next release (5.4.1) Oct 7, 2026

Flamefire deleted the toy-and-test-dir-constants-6 branch October 7, 2026 12:34

Conversation

Flamefire commented Aug 27, 2026

Uh oh!

boegel commented Sep 3, 2026

Uh oh!

akesandgren commented Sep 21, 2026

Uh oh!

Flamefire commented Sep 22, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akesandgren Oct 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akesandgren commented Oct 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Flamefire left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akesandgren commented Oct 7, 2026

Uh oh!

akesandgren commented Oct 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Flamefire commented Oct 7, 2026

Uh oh!

boegel commented Oct 7, 2026

Uh oh!

Flamefire commented Oct 7, 2026 • edited by boegel Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

akesandgren left a comment

Choose a reason for hiding this comment

Uh oh!

akesandgren commented Oct 7, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

akesandgren Oct 6, 2026 •

edited

Loading

akesandgren commented Oct 6, 2026 •

edited

Loading

akesandgren commented Oct 7, 2026 •

edited

Loading

Flamefire commented Oct 7, 2026 •

edited by boegel

Loading