Correction in tests/test_elegant_wrapper.py for determining whether ELEGANT is installed

[ben-c-2013]

No description provided.

[kyrsjo]

Not sure about this.

This seems to append "elegant" to CONFIG.elegant_exec. Looking into where this comes from, it can come from either (a) the TOML file directly https://github.com/abel-framework/ABEL/blob/main/abel/abelconfig.toml#L63 , (b) if elegant_use_container is False (i.e. laptop) then it takes just elegant_path https://github.com/abel-framework/ABEL/blob/main/abel/CONFIG.py#L127C1-L127C48 , and (c) if True (i.e. cluster) it uses a more complicated pattern https://github.com/abel-framework/ABEL/blob/main/abel/CONFIG.py#L124

Thus, the solution is probably to set the correct path in your TOML file, not this patch.

Also, I would generally strongly recommend to use os.path.join() to add together pieces of paths, not "+" and pray that the slashes are correct.

[kyrsjo]

See comment in main thread.

[ben-c-2013]

Not sure about this.

This seems to append "elegant" to CONFIG.elegant_exec. Looking into where this comes from, it can come from either (a) the TOML file directly https://github.com/abel-framework/ABEL/blob/main/abel/abelconfig.toml#L63 , (b) if elegant_use_container is False (i.e. laptop) then it takes just elegant_path https://github.com/abel-framework/ABEL/blob/main/abel/CONFIG.py#L127C1-L127C48 , and (c) if True (i.e. cluster) it uses a more complicated pattern https://github.com/abel-framework/ABEL/blob/main/abel/CONFIG.py#L124

Thus, the solution is probably to set the correct path in your TOML file, not this patch.

Also, I would generally strongly recommend to use os.path.join() to add together pieces of paths, not "+" and pray that the slashes are correct.

I totally agree with using os.path.join() intstead. A blunder from my side for not doing it.

However not sure if we should change the path in the TOML file at all, as the path is supposed to point to a folder containing a lot of the tools needed by ELEGANT, and not just the ELEGANT binary.

[kyrsjo]

However not sure if we should change the path in the TOML file at all, as the path is supposed to point to a folder containing a lot of the tools needed by ELEGANT, and not just the ELEGANT binary.

The TOML file comment says # Path to elegant executable., which would include the actual executable, not just the folder it is in. The confusion is probably because it works differently when using a container, in which case CONFIG.py adds the elegant.sif when generating elegant_exec and adding all the other incantations to actually launch elegant from inside this .sif.

So the code in elgant_wrapper was already correct, the problem was that the default in https://github.com/abel-framework/ABEL/blob/main/abel/abelconfig.toml#L59C57-L59C86 should have been ['$software_path', 'elegant', 'bin', 'elegant] I think. Alternatively, CONFIG.py should add elegant to elegant_path when generating elegant_exec.

[ben-c-2013]

Tested commits cd60d43 and 8b32db9 in the following way (tested both locally and on LUMI):

• pytest -v tests/test_elegant_wrapper.py passed when the ELEGANT executable is located as specified by elegant_path.
• Changed the folder name of the ELEGANT executable, pytest -v tests/test_elegant_wrapper.py skipped the tests as expected.
• Changed the folder name of the ELEGANT executable, but with elegant_is_installed = true in .abelconfig.toml in my home directory. pytest -v tests/test_elegant_wrapper.py` now does not skip the tests and will fail them as expected.
• Set elegant_is_installed = false in .abelconfig.toml in my home directory. pytest -v tests/test_elegant_wrapper.pynow will skip the tests even though the ELEGANT executable is located as specified byelegant_path`.