Skip to content

Commit

Permalink
Merge branch 'main' into fix/pyvista-version-to-0.38.1
Browse files Browse the repository at this point in the history
  • Loading branch information
germa89 authored Nov 20, 2023
2 parents 9f68a89 + ccb5050 commit 034148b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,6 @@ jobs:
export ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}
pytest -k "not test_dpf" \
${{ env.PYTEST_ARGUMENTS }} \
--skip-regression-check \
--cov-report=xml:ubuntu-v22.2.0-local-minimal.xml
- uses: codecov/codecov-action@v3
Expand Down
12 changes: 0 additions & 12 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,6 @@ def pytest_addoption(parser):
default=False,
help="run only GUI tests",
)
parser.addoption(
"--skip-regression-check",
action="store_true",
default=False,
help="Avoid checking the image regression check in all tests",
)


def pytest_collection_modifyitems(config, items):
Expand Down Expand Up @@ -302,13 +296,7 @@ def pytest_collection_modifyitems(config, items):

@pytest.fixture(autouse=True)
def wrapped_verify_image_cache(verify_image_cache, pytestconfig):
# Checking if we want to avoid the check using pytest cli.
skip_regression_check = pytestconfig.option.skip_regression_check
if skip_regression_check:
verify_image_cache.skip = True

# Configuration
# default check
verify_image_cache.error_value = 500.0
verify_image_cache.warning_value = 200.0

Expand Down

0 comments on commit 034148b

Please sign in to comment.