summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2021-02-22 12:03:53 -0500
committerGitHub <noreply@github.com>2021-02-22 12:03:53 -0500
commit38aee6eebb160d46287c63a979bb897b15bb2f96 (patch)
tree6c15bd72e2d6a5e0eb5c363525a9d4853c642415 /tox.ini
parent66e2d42dd1b722dc8e59f4e5990cea54f81ccd2a (diff)
downloadcloud-init-git-38aee6eebb160d46287c63a979bb897b15bb2f96.tar.gz
integration_tests: introduce lxd_use_exec mark (#802)
pycloudlib has modified the way LXD executes tests (https://github.com/canonical/pycloudlib/pull/114): it will always use SSH to access them by default, instead of using `lxc exec`. This behaviour is transparent for them majority of cloud-init's integration tests, but some currently depend on using `lxc exec` to access instances with (intentionally) broken networking: obviously these are not accessible via SSH. pycloudlib retains support for switching an instance to use `lxc exec`. This commit introduces the `lxd_use_exec` mark, which tests can use to indicate to the integration testing framework that they should be so switched, and applies it to all applicable tests.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 1887e582..0e2eae46 100644
--- a/tox.ini
+++ b/tox.ini
@@ -176,6 +176,7 @@ markers =
oci: test will only run on OCI platform
lxd_config_dict: set the config_dict passed on LXD instance creation
lxd_container: test will only run in LXD container
+ lxd_use_exec: `execute` will use `lxc exec` instead of SSH
lxd_vm: test will only run in LXD VM
not_xenial: test cannot run on the xenial release
not_bionic: test cannot run on the bionic release