diff --git a/changelog/62239.removed b/changelog/62239.removed new file mode 100644 index 00000000000..c065051cc9a --- /dev/null +++ b/changelog/62239.removed @@ -0,0 +1 @@ +Removed ``runtests`` targets from ``noxfile.py`` diff --git a/noxfile.py b/noxfile.py index 61a6d0d08ca..acd57029152 100644 --- a/noxfile.py +++ b/noxfile.py @@ -367,127 +367,6 @@ def _run_with_coverage(session, *test_cmd, env=None): ) -def _runtests(session): - session.error( - """\n\nruntests.py support has been removed from Salt. Please try `nox -e '{0}'` """ - """or `nox -e '{0}' -- --help` to know more about the supported CLI flags.\n""" - "For more information, please check " - "https://docs.saltproject.io/en/latest/topics/development/tests/index.html#running-the-tests\n..".format( - session._runner.global_config.sessions[0].replace("runtests", "pytest") - ) - ) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-parametrized") -@nox.parametrize("coverage", [False, True]) -@nox.parametrize("transport", ["zeromq", "tcp"]) -@nox.parametrize("crypto", [None, "m2crypto", "pycryptodome"]) -def runtests_parametrized(session, coverage, transport, crypto): - """ - DO NOT CALL THIS NOX SESSION DIRECTLY - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS) -@nox.parametrize("coverage", [False, True]) -def runtests(session, coverage): - """ - runtests.py session with zeromq transport and default crypto - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-tcp") -@nox.parametrize("coverage", [False, True]) -def runtests_tcp(session, coverage): - """ - runtests.py session with TCP transport and default crypto - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-zeromq") -@nox.parametrize("coverage", [False, True]) -def runtests_zeromq(session, coverage): - """ - runtests.py session with zeromq transport and default crypto - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-m2crypto") -@nox.parametrize("coverage", [False, True]) -def runtests_m2crypto(session, coverage): - """ - runtests.py session with zeromq transport and m2crypto - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-tcp-m2crypto") -@nox.parametrize("coverage", [False, True]) -def runtests_tcp_m2crypto(session, coverage): - """ - runtests.py session with TCP transport and m2crypto - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-zeromq-m2crypto") -@nox.parametrize("coverage", [False, True]) -def runtests_zeromq_m2crypto(session, coverage): - """ - runtests.py session with zeromq transport and m2crypto - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-pycryptodome") -@nox.parametrize("coverage", [False, True]) -def runtests_pycryptodome(session, coverage): - """ - runtests.py session with zeromq transport and pycryptodome - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-tcp-pycryptodome") -@nox.parametrize("coverage", [False, True]) -def runtests_tcp_pycryptodome(session, coverage): - """ - runtests.py session with TCP transport and pycryptodome - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-zeromq-pycryptodome") -@nox.parametrize("coverage", [False, True]) -def runtests_zeromq_pycryptodome(session, coverage): - """ - runtests.py session with zeromq transport and pycryptodome - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-cloud") -@nox.parametrize("coverage", [False, True]) -def runtests_cloud(session, coverage): - """ - runtests.py cloud tests session - """ - _runtests(session) - - -@nox.session(python=_PYTHON_VERSIONS, name="runtests-tornado") -@nox.parametrize("coverage", [False, True]) -def runtests_tornado(session, coverage): - """ - runtests.py tornado tests session - """ - _runtests(session) - - @nox.session(python=_PYTHON_VERSIONS, name="pytest-parametrized") @nox.parametrize("coverage", [False, True]) @nox.parametrize("transport", ["zeromq", "tcp"])