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.

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

Remove Iris' TestRunner #5205

Merged
merged 1 commit into from
Mar 23, 2023
Merged
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
3 changes: 3 additions & 0 deletions docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ This document explains the changes made to Iris for this release
#. `@lbdreyer`_ and `@trexfeathers`_ (reviewer) removed the ``--coding-tests``
option from Iris' test runner. (:pull:`4765`)

#. `@lbdreyer`_ removed the Iris TestRunner. Tests are now run via nox or
pytest. (:pull:`5205`)


.. comment
Whatsnew author names (@github name) in alphabetical order. Note that,
Expand Down
3 changes: 1 addition & 2 deletions lib/iris/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ def get_dir_option(section, option, default=None):
)

# Override the data repository if the appropriate environment variable
# has been set. This is used in setup.py in the TestRunner command to
# enable us to simulate the absence of external data.
# has been set.
override = os.environ.get("OVERRIDE_TEST_DATA_REPOSITORY")
if override:
TEST_DATA_DIR = None
Expand Down
9 changes: 0 additions & 9 deletions lib/iris/tests/runner/__init__.py

This file was deleted.

39 changes: 0 additions & 39 deletions lib/iris/tests/runner/__main__.py

This file was deleted.

143 changes: 0 additions & 143 deletions lib/iris/tests/runner/_runner.py

This file was deleted.

18 changes: 9 additions & 9 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,13 @@ def tests(session: nox.sessions.Session):
session.install("--no-deps", "--editable", ".")
session.env.update(ENV)
run_args = [
"python",
"-m",
"iris.tests.runner",
"--default-tests",
"pytest",
"-n",
"auto",
"lib/iris/tests",
]
if "-c" in session.posargs or "--coverage" in session.posargs:
run_args.append("--coverage")
run_args[-1:-1] = ["--cov=lib/iris", "--cov-report=xml"]
session.run(*run_args)


Expand Down Expand Up @@ -241,10 +241,10 @@ def gallery(session: nox.sessions.Session):
session.install("--no-deps", "--editable", ".")
session.env.update(ENV)
session.run(
"python",
"-m",
"iris.tests.runner",
"--gallery-tests",
"pytest",
"-n",
"auto",
"docs/gallery_tests",
)


Expand Down