From acf81cd79c373812b5fd0a470f949aaeadabc736 Mon Sep 17 00:00:00 2001 From: Prithwish Mukherjee <109645853+prmukherj@users.noreply.github.com> Date: Fri, 19 May 2023 14:29:20 +0530 Subject: [PATCH] Fix product version in launch remote fluent. (#1604) * Fix product version in launch remote fluent. * Fix test. * Remove commented lines. --------- Co-authored-by: Your Name --- src/ansys/fluent/core/launcher/launcher.py | 8 +++++++- tests/test_launcher_remote.py | 7 ++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ansys/fluent/core/launcher/launcher.py b/src/ansys/fluent/core/launcher/launcher.py index 73113cb6a4e..bdae5e1c106 100644 --- a/src/ansys/fluent/core/launcher/launcher.py +++ b/src/ansys/fluent/core/launcher/launcher.py @@ -649,11 +649,17 @@ def launch_fluent( logger.info( "Starting Fluent remotely. The startup configuration will be ignored." ) + + if product_version: + fluent_product_version = "".join(product_version.split("."))[:-1] + else: + fluent_product_version = "latest" + return launch_remote_fluent( session_cls=new_session, start_timeout=start_timeout, start_transcript=start_transcript, - product_version="".join(get_ansys_version().split("."))[:-1], + product_version=fluent_product_version, cleanup_on_exit=cleanup_on_exit, meshing_mode=meshing_mode, dimensionality=version, diff --git a/tests/test_launcher_remote.py b/tests/test_launcher_remote.py index 4bc4f385f31..8a2897d8917 100644 --- a/tests/test_launcher_remote.py +++ b/tests/test_launcher_remote.py @@ -52,12 +52,9 @@ def test_launch_remote_instance(monkeypatch, new_solver_session): # Assert: PyFluent went through the pypim workflow assert mock_is_configured.called assert mock_connect.called - if os.getenv("FLUENT_IMAGE_TAG"): - product_version = docker_image_version.get_version_for_filepath() - else: - product_version = "".join(launcher.get_ansys_version().split("."))[:-1] + mock_client.create_instance.assert_called_with( - "fluent-3ddp", product_version=product_version + "fluent-3ddp", product_version="latest" ) assert mock_instance.wait_for_ready.called mock_instance.build_grpc_channel.assert_called_with()