Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
146 changes: 0 additions & 146 deletions .github/workflows/test-run-wo-codegen-weekly.yml

This file was deleted.

85 changes: 0 additions & 85 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,6 @@ PYTESTRERUN = --last-failed --last-failed-no-failures none -n auto

unittest: unittest-dev-242

unittest-dev-222:
@echo "Running unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --fluent-version=22.2 $(PYTESTEXTRA) || python -m pytest --fluent-version=22.2 $(PYTESTRERUN)

unittest-dev-231:
@echo "Running unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --fluent-version=23.1 $(PYTESTEXTRA) || python -m pytest --fluent-version=23.1 $(PYTESTRERUN)

unittest-dev-232:
@echo "Running unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --fluent-version=23.2 $(PYTESTEXTRA) || python -m pytest --fluent-version=23.2 $(PYTESTRERUN)

unittest-dev-241:
@echo "Running unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --fluent-version=24.1 $(PYTESTEXTRA) || python -m pytest --fluent-version=24.1 $(PYTESTRERUN)

unittest-dev-242:
@echo "Running unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
Expand All @@ -79,56 +59,11 @@ unittest-dev-271:
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
@python -m pytest --fluent-version=27.1 $(PYTESTEXTRA) || python -m pytest --fluent-version=27.1 $(PYTESTRERUN)

unittest-all-222:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=22.2 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=22.2 $(PYTESTRERUN)

unittest-all-222-no-codegen:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=22.2 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=22.2 -m "not codegen_required" $(PYTESTRERUN)

unittest-all-231:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=23.1 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=23.1 $(PYTESTRERUN)

unittest-all-231-no-codegen:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=23.1 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=23.1 -m "not codegen_required" $(PYTESTRERUN)

unittest-all-232:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=23.2 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=23.2 $(PYTESTRERUN)

unittest-all-232-no-codegen:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=23.2 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=23.2 -m "not codegen_required" $(PYTESTRERUN)

unittest-all-241:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=24.1 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=24.1 $(PYTESTRERUN)

unittest-all-241-no-codegen:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=24.1 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=24.1 -m "not codegen_required" $(PYTESTRERUN)

unittest-all-242:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=24.2 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=24.2 $(PYTESTRERUN)

unittest-all-242-no-codegen:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=24.2 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=24.2 -m "not codegen_required" $(PYTESTRERUN)

unittest-all-251:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
Expand All @@ -139,11 +74,6 @@ unittest-solvermode-251:
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --fluent-version=25.1 --solvermode $(PYTESTEXTRA) || python -m pytest --fluent-version=25.1 --solvermode $(PYTESTRERUN)

unittest-all-251-no-codegen:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=25.1 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=25.1 -m "not codegen_required" $(PYTESTRERUN)

unittest-all-252:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
Expand All @@ -154,11 +84,6 @@ unittest-solvermode-252:
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
@python -m pytest --fluent-version=25.2 --solvermode $(PYTESTEXTRA) || python -m pytest --fluent-version=25.2 --solvermode $(PYTESTRERUN)

unittest-all-252-no-codegen:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=25.2 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=25.2 -m "not codegen_required" $(PYTESTRERUN)

unittest-all-261:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
Expand All @@ -169,11 +94,6 @@ unittest-solvermode-261:
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
@python -m pytest --fluent-version=26.1 --solvermode $(PYTESTEXTRA) || python -m pytest --fluent-version=26.1 --solvermode $(PYTESTRERUN)

unittest-all-261-no-codegen:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=26.1 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=26.1 -m "not codegen_required" $(PYTESTRERUN)

unittest-all-271:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
Expand All @@ -184,11 +104,6 @@ unittest-solvermode-271:
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
@python -m pytest --fluent-version=27.1 --solvermode $(PYTESTEXTRA) || python -m pytest --fluent-version=27.1 --solvermode $(PYTESTRERUN)

unittest-all-271-no-codegen:
@echo "Running all unittests"
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
@python -m pytest --nightly --fluent-version=27.1 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=27.1 -m "not codegen_required" $(PYTESTRERUN)

api-codegen:
@echo "Running API codegen"
@python -m venv env
Expand Down
1 change: 1 addition & 0 deletions doc/changelog.d/5107.maintenance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Clean up test markers
Comment thread
prmukherj marked this conversation as resolved.
Comment thread
prmukherj marked this conversation as resolved.
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ addopts = """
markers = [
"settings_only: Read and modify the case settings only, without loading the mesh, initializing, or solving the case",
"nightly: Tests that run under nightly CI",
"codegen_required: Tests that requires codegen",
"fluent_version(version): Tests that runs with specified Fluent version",
"standalone: Tests that cannot be run within container"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@


@pytest.mark.nightly
@pytest.mark.codegen_required
@pytest.mark.fluent_version("latest")
def test_simple_solve(mixing_elbow_param_case_data_session):
"""Use case 1: This optiSLang integration test performs these steps.
Expand Down Expand Up @@ -143,7 +142,6 @@ def test_simple_solve(mixing_elbow_param_case_data_session):


@pytest.mark.nightly
@pytest.mark.codegen_required
@pytest.mark.fluent_version("latest")
def test_simple_solve_unitless(static_mixer_params_unitless_session):
solver_session = static_mixer_params_unitless_session
Expand Down Expand Up @@ -207,7 +205,6 @@ def test_simple_solve_unitless(static_mixer_params_unitless_session):


@pytest.mark.nightly
@pytest.mark.codegen_required
@pytest.mark.fluent_version("latest")
def test_generate_read_mesh(mixing_elbow_geometry_filename):
"""Use case 2: This optiSLang integration test performs these steps.
Expand Down Expand Up @@ -271,7 +268,6 @@ def test_generate_read_mesh(mixing_elbow_geometry_filename):


@pytest.mark.nightly
@pytest.mark.codegen_required
@pytest.mark.fluent_version("latest")
def test_case_file():
case_path = examples.download_file(
Expand Down Expand Up @@ -310,7 +306,6 @@ def test_case_file():


@pytest.mark.nightly
@pytest.mark.codegen_required
@pytest.mark.fluent_version("latest")
def test_parameters(mixing_elbow_param_case_data_session):
solver_session = mixing_elbow_param_case_data_session
Expand Down Expand Up @@ -338,7 +333,6 @@ def test_parameters(mixing_elbow_param_case_data_session):


@pytest.mark.nightly
@pytest.mark.codegen_required
@pytest.mark.fluent_version("latest")
def test_parametric_project(mixing_elbow_param_case_data_session, new_solver_session):
Path(pyfluent.config.examples_path).mkdir(parents=True, exist_ok=True)
Expand Down
1 change: 0 additions & 1 deletion tests/parametric/test_parametric_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ def test_parametric_workflow():
solver_session.exit()


@pytest.mark.fluent_version(">=24.2")
def test_parameters_list_function(static_mixer_settings_session):
solver = static_mixer_settings_session
solver.tui.define.parameters.enable_in_TUI("yes")
Expand Down
2 changes: 0 additions & 2 deletions tests/test_aero_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
from ansys.fluent.core.docker.utils import get_grpc_launcher_args_for_gh_runs


@pytest.mark.fluent_version(">=24.2")
def test_aero_session():
grpc_kwds = get_grpc_launcher_args_for_gh_runs()
aero_session = pyfluent.launch_fluent(
Expand All @@ -43,7 +42,6 @@ def test_aero_session():

@pytest.mark.skip(reason=SKIP_BLOCKED)
# Run this locally only as of now.
@pytest.mark.fluent_version(">=24.2")
def test_sample_setup():
mesh_filepath = examples.download_file(
"wing.msh.h5",
Expand Down
2 changes: 0 additions & 2 deletions tests/test_batch_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from ansys.fluent.core import examples


@pytest.mark.fluent_version(">=24.1")
def test_batch_ops_create_mesh():
solver = pyfluent.Solver.from_container(insecure_mode=True)
mesh = solver.results.graphics.mesh
Expand All @@ -44,7 +43,6 @@ def test_batch_ops_create_mesh():
assert "mesh-1" in mesh.get_object_names()


@pytest.mark.fluent_version(">=24.1")
def test_batch_ops_create_mesh_and_access_fails(new_solver_session):
solver = new_solver_session
mesh = solver.results.graphics.mesh
Expand Down
Loading
Loading