Skip to content

Replaced python sdk usage with docker cli #800

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
merged 2 commits into from
Aug 30, 2022
Merged

Replaced python sdk usage with docker cli #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdcf395
Replaced python sdk usage with docker cli
hpohekar Aug 29, 2022
aaf87bd
Removed docker requirement and updated get ids function
hpohekar Aug 30, 2022
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
3 changes: 1 addition & 2 deletions requirements/requirements_tests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
pytest
pytest-mock
pytest-cov
psutil>=5.9.1
docker>=5.0.3
psutil>=5.9.1
26 changes: 16 additions & 10 deletions tests/test_fluent_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import subprocess
import time

import psutil
Expand All @@ -10,7 +11,6 @@
import ansys.fluent.core as pyfluent
from ansys.fluent.core.examples import download_file
from ansys.fluent.core.session import _FluentConnection
import docker


def _read_case(session):
Expand Down Expand Up @@ -54,18 +54,25 @@ def print_transcript(transcript):
assert not print_transcript.called


def get_container_ids_set():
proc = subprocess.Popen(["docker", "ps", "-q"], stdout=subprocess.PIPE)
output_bytes = proc.stdout.read()
output_str = output_bytes.decode()
ids = output_str.strip().split()
return set(ids)


def test_server_exits_when_session_goes_out_of_scope(with_launching_container) -> None:
def f():
session = pyfluent.launch_fluent(mode="solver")
f.server_pid = session.scheme_eval.scheme_eval("(%cx-process-id)")

if os.getenv("PYFLUENT_START_INSTANCE") == "0":
client = docker.from_env()
containers_before = client.containers.list()
containers_before = get_container_ids_set()
f()
time.sleep(10)
containers_after = client.containers.list()
new_containers = set(containers_after) - set(containers_before)
containers_after = get_container_ids_set()
new_containers = containers_after - containers_before
assert not new_containers
else:
f()
Expand All @@ -81,15 +88,14 @@ def f():
f.server_pid = session.scheme_eval.scheme_eval("(%cx-process-id)")

if os.getenv("PYFLUENT_START_INSTANCE") == "0":
client = docker.from_env()
containers_before = client.containers.list()
containers_before = get_container_ids_set()
f()
time.sleep(10)
containers_after = client.containers.list()
new_containers = set(containers_after) - set(containers_before)
containers_after = get_container_ids_set()
new_containers = containers_after - containers_before
assert new_containers
for container in new_containers:
container.stop()
subprocess.Popen(["docker", "stop", container])
else:
f()
time.sleep(10)
Expand Down