Skip to content
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

Separate pyrms tests #73

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+21 −13
Open

Separate pyrms tests #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
848201f
Tests: skip tests for pyrms simulate adapters
kspieks Jun 1, 2021
b05b253
Add options to makefile to skip the pyrms tests
kspieks Jun 1, 2021
222ebe3
Allow GitHub to separate pyrms tests from other T3 tests
kspieks Jun 1, 2021
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: 2 additions & 1 deletion .github/workflows/cont_int.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ jobs:
cd ..
cd T3
conda activate t3_env
make test
make test-no-pyrms
make test-pyrms
codecov
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,9 @@ test-main:

test-functional:
pytest tests/test_functional.py -ra -vv

test-no-pyrms:
pytest -ra -vv -m "not skip"

test-pyrms:
pytest -ra -vv -m "skip"
9 changes: 5 additions & 4 deletions tests/test_simulate_adapters/test_rms_constantHP.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""

import os
import pytest
import shutil

from t3.common import SIMULATE_DATA_BASE_PATH
Expand All @@ -15,7 +16,7 @@

TEST_DIR = os.path.join(SIMULATE_DATA_BASE_PATH, 'rms_simulator_test')


@pytest.mark.skip(reason="Skipping pyrms tests.")
def test_set_up_no_sa():
"""
Run RMG's minimal example without SA by testing the `set_up` method within the RMSSimulator init method.
Expand All @@ -36,7 +37,7 @@ def test_set_up_no_sa():
# check that there are over 20 time steps (as an arbitrary number) to indicate that the solver completed
assert len(rms_simulator_adapter.sol.t) > 20


@pytest.mark.skip(reason="Skipping pyrms tests.")
def test_get_sa_coefficients():
"""
Run RMG's minimal example with SA.
Expand Down Expand Up @@ -65,7 +66,7 @@ def test_get_sa_coefficients():
assert len(sa_dict['kinetics']) == 2
assert len(sa_dict['thermo']) == 2


@pytest.mark.skip(reason="Skipping pyrms tests.")
def test_get_idt_by_T():
"""
Calculate the ignition delay time for RMG's minimal example.
Expand All @@ -87,7 +88,7 @@ def test_get_idt_by_T():
assert len(idt_dict['idt']) == 1
assert len(idt_dict['idt_index']) == 1


@pytest.mark.skip(reason="Skipping pyrms tests.")
def teardown_module():
"""
A method that is run after all unit tests in this class.
Expand Down
8 changes: 4 additions & 4 deletions tests/test_simulate_adapters/test_rms_constantTP.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

TEST_DIR = os.path.join(SIMULATE_DATA_BASE_PATH, 'rms_simulator_test')


@pytest.mark.skip(reason="Skipping pyrms tests.")
def test_set_up_no_sa():
"""
Run RMG's minimal example without SA by testing the `set_up` method within the RMSSimulator init method.
Expand All @@ -36,7 +36,7 @@ def test_set_up_no_sa():
# check that there are over 20 time steps (as an arbitrary number) to indicate that the solver completed
assert len(rms_simulator_adapter.sol.t) > 20


@pytest.mark.skip(reason="Skipping pyrms tests.")
def test_get_sa_coefficients():
"""
Run RMG's minimal example with SA.
Expand Down Expand Up @@ -65,7 +65,7 @@ def test_get_sa_coefficients():
assert len(sa_dict['kinetics']) == 2
assert len(sa_dict['thermo']) == 2


@pytest.mark.skip(reason="Skipping pyrms tests.")
def test_get_idt_by_T():
"""
Calculate the ignition delay time for RMG's minimal example.
Expand All @@ -87,7 +87,7 @@ def test_get_idt_by_T():
assert len(idt_dict['idt']) == 0
assert len(idt_dict['idt_index']) == 0


@pytest.mark.skip(reason="Skipping pyrms tests.")
def teardown_module():
"""
A method that is run after all unit tests in this class.
Expand Down
8 changes: 4 additions & 4 deletions tests/test_simulate_adapters/test_rms_constantUV.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

TEST_DIR = os.path.join(SIMULATE_DATA_BASE_PATH, 'rms_simulator_test')


@pytest.mark.skip(reason="Skipping pyrms tests.")
def test_set_up_no_sa():
"""
Run RMG's minimal example without SA by testing the `set_up` method within the RMSSimulator init method.
Expand All @@ -36,7 +36,7 @@ def test_set_up_no_sa():
# check that there are over 20 time steps (as an arbitrary number) to indicate that the solver completed
assert len(rms_simulator_adapter.sol.t) > 20


@pytest.mark.skip(reason="Skipping pyrms tests.")
def test_get_sa_coefficients():
"""
Run RMG's minimal example with SA.
Expand Down Expand Up @@ -65,7 +65,7 @@ def test_get_sa_coefficients():
assert len(sa_dict['kinetics']) == 2
assert len(sa_dict['thermo']) == 2


@pytest.mark.skip(reason="Skipping pyrms tests.")
def test_get_idt_by_T():
"""
Calculate the ignition delay time for RMG's minimal example.
Expand All @@ -87,7 +87,7 @@ def test_get_idt_by_T():
assert len(idt_dict['idt']) == 1
assert len(idt_dict['idt_index']) == 1


@pytest.mark.skip(reason="Skipping pyrms tests.")
def teardown_module():
"""
A method that is run after all unit tests in this class.
Expand Down