Skip to content

Commit

Permalink
tests: Add 'adhoc' mark for integration tests
Browse files Browse the repository at this point in the history
Also new jenkins tox definition
  • Loading branch information
TheRealFalcon committed Jun 17, 2021
1 parent c8d3f99 commit 24a6f3b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions tests/integration_tests/bugs/test_gh868.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"""


@pytest.mark.adhoc # Can't be regularly reaching out to chef install script
@pytest.mark.user_data(USERDATA)
def test_chef_license(client: IntegrationInstance):
log = client.read_from_file('/var/log/cloud-init.log')
Expand Down
11 changes: 10 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,15 @@ passenv = CLOUD_INIT_* SSH_AUTH_SOCK OS_* TRAVIS
deps =
-r{toxinidir}/integration-requirements.txt
setenv =
PYTEST_ADDOPTS="-m ci"
PYTEST_ADDOPTS="-m ci and not adhoc"

[testenv:integration-tests-jenkins]
commands = {envpython} -m pytest --log-cli-level=INFO {posargs:tests/integration_tests}
passenv = CLOUD_INIT_* SSH_AUTH_SOCK OS_*
deps =
-r{toxinidir}/integration-requirements.txt
setenv =
PYTEST_ADDOPTS="-m not adhoc"

[pytest]
# TODO: s/--strict/--strict-markers/ once xenial support is dropped
Expand Down Expand Up @@ -190,3 +198,4 @@ markers =
sru_next: test is part of the next SRU verification
ubuntu: this test should run on Ubuntu
unstable: skip this test because it is flakey
adhoc: only run adhoc, not in any CI environment (travis or jenkins)

0 comments on commit 24a6f3b

Please sign in to comment.