Skip to content

fix: remove exceptions on mapdl object deletion #3826

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
germa89 merged 7 commits into from
Apr 11, 2025
Merged

fix: remove exceptions on mapdl object deletion #3826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd95771
fix: remove exceptions on mapdl object deletion
germa89 Apr 7, 2025
9fc1a9c
chore: adding changelog file 3826.fixed.md [dependabot-skip]
pyansys-ci-bot Apr 7, 2025
0c08965
fix: making sure we not run scancely
germa89 Apr 7, 2025
6b450bd
fix: prevent premature exit by overriding __del__ method in test cases
germa89 Apr 8, 2025
840f7bd
Merge branch 'main' into fix/exceptions-on-mapdl-deletion-on-tests
clatapie Apr 9, 2025
ba0b132
fix: overriding exit methods
germa89 Apr 9, 2025
9166f87
chore: merge branch 'fix/exceptions-on-mapdl-deletion-on-tests' of ht…
germa89 Apr 9, 2025
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
1 change: 1 addition & 0 deletions doc/changelog.d/3826.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: remove exceptions on mapdl object deletion
1 change: 1 addition & 0 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ def run_before_and_after_tests(
assert not mapdl.ignore_errors, "Mapdl class is ignoring errors!"
assert not mapdl.mute
assert mapdl.file_type_for_plots in VALID_DEVICES
assert mapdl._jobid is None

# Returning to default
mapdl.graphics("full")
Expand Down
2 changes: 2 additions & 0 deletions tests/test_launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2001,11 +2001,13 @@ def test_args_pass(monkeypatch, arg, value, method):
monkeypatch.delenv("PYMAPDL_START_INSTANCE", False)

kwargs = {arg: value}

mapdl = launch_mapdl(**kwargs)
meth = getattr(mapdl, method)
assert meth == value

mapdl._ctrl = lambda *args, **kwargs: None
mapdl.kill_job = lambda *args, **kwargs: None
del mapdl


Expand Down
21 changes: 12 additions & 9 deletions tests/test_mapdl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2665,13 +2665,15 @@ def test_ip_hostname_in_start_parm(ip):
mck_sock.return_value = ("myhostname",)
mapdl = pymapdl.Mapdl(disable_run_at_connect=False, **start_parm)

if ip == "myhostname":
assert mapdl.ip == "123.45.67.99"
else:
assert mapdl.ip == ip
if ip == "myhostname":
assert mapdl.ip == "123.45.67.99"
else:
assert mapdl.ip == ip

assert mapdl.hostname == "myhostname"
del mapdl
assert mapdl.hostname == "myhostname"
mapdl.kill_job = lambda x: None # Avoiding exit
mapdl.__del__ = lambda x: None # Avoiding exit
del mapdl


def test_directory_setter(mapdl, cleared):
Expand Down Expand Up @@ -2982,7 +2984,6 @@ def test_muted(mapdl, prop):
)
@patch("ansys.tools.path.path._mapdl_version_from_path", lambda *args, **kwargs: 242)
@stack(*PATCH_MAPDL)
@patch("ansys.mapdl.core.Mapdl._exit_mapdl", lambda *args, **kwargs: None)
@pytest.mark.parametrize("set_no_abort", [True, False, None])
@pytest.mark.parametrize("start_instance", [True, False])
def test_set_no_abort(monkeypatch, set_no_abort, start_instance):
Expand All @@ -2998,10 +2999,12 @@ def test_set_no_abort(monkeypatch, set_no_abort, start_instance):
):
mapdl = launch_mapdl(set_no_abort=set_no_abort, start_instance=start_instance)

mapdl._exit_mapdl = lambda *args, **kwargs: None # Avoiding exit
mapdl.__del__ = lambda x: None # Avoiding exit
del mapdl

kwargs = mock_run.call_args_list[0].kwargs
calls = [each.args[0].upper() for each in mock_run.call_args_list]

if set_no_abort is None or set_no_abort:
assert any(["/NERR,,,-1" in each for each in calls])

del mapdl