Use modern tox invocation syntax

Signed-off-by: Simon Deziel <[email protected]>
simondeziel · Oct 17, 2023 · e6d52b6 · e6d52b6
1 parent 3bae0b7
commit e6d52b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
@@ -64,20 +64,20 @@ Code standards
 
 pyLXD formats code with Black and isort. Verify the formatting with::
 
-    tox -e lint
+    tox run -e lint
 
 If it fails, you can reformat the code with::
 
-    tox -e format
+    tox run -e format
 
 Testing
 -------
 
 Testing pyLXD is in 3 parts:
 
-1. Conformance with Black and isort, using the ``tox -e lint`` command.
-2. Unit tests using ``tox -e py`` or ``tox -e coverage``.
-3. Integration tests using the ``tox -e integration-in-lxd``.
+1. Conformance with Black and isort, using the ``tox run -e lint`` command.
+2. Unit tests using ``tox run -e py`` or ``tox run -e coverage``.
+3. Integration tests using the ``tox run -e integration-in-lxd``.
 
 .. note:: all of the tests can be run by just using the ``tox`` command on it's
           own, with the exception of the integration tests.  These are not
@@ -103,7 +103,7 @@ Integration Testing
 ^^^^^^^^^^^^^^^^^^^
 
 Integration testing requires a running LXD system.  They can be tested locally
-in LXD container with nesting support; ``tox -e integration-in-lxd``.
+in LXD container with nesting support; ``tox run -e integration-in-lxd``.
 
 .. _Github: https://github.com/canonical/pylxd
 .. _Tox: https://tox.wiki/en/latest/

diff --git a/integration/run-integration-tests b/integration/run-integration-tests
@@ -47,7 +47,7 @@ OLD_TRUST_LIST="$(mktemp)"
 save_trust_list > "${OLD_TRUST_LIST}"
 
 # finally run the integration tests
-tox -e integration
+tox run -e integration
 
 # Remove any cert added to the trusted list by the integration tests
 NEW_TRUST_LIST="$(mktemp)"

diff --git a/migration/run_migration_integration_tests-18-04 b/migration/run_migration_integration_tests-18-04
@@ -70,7 +70,7 @@ lxc exec "$CONTAINER_ONE_NAME" -- mkdir -p /opt/pylxd
 # NOTE: rockstar (13 Sep 2016) - --recursive is not supported in lxd <2.1, so
 # until we have pervasive support for that, we'll do this tar hack.
 tar cf - ./* .git | lxc exec "$CONTAINER_ONE_NAME" -- tar xf - -C /opt/pylxd
-lxc exec "$CONTAINER_ONE_NAME" -- /bin/sh -c "cd /opt/pylxd && tox -emigration"
+lxc exec "$CONTAINER_ONE_NAME" -- /bin/sh -c "cd /opt/pylxd && tox run -e migration"
 
 lxc delete --force "$CONTAINER_ONE_NAME"
 lxc delete --force "$CONTAINER_TWO_NAME"