Add skip reason next to test name in zuul output

Currently our test names are long and we pipe pytest output to a file,
so the skip reason gets truncated; setting this env var .zuul and
passing to tox.ini will allow us to see the reason why pytest is
skipping next to the test name.

Drive-by: remove passenv from s3api tests in tox.ini so they are
inherited from testenv

Related-Change-Id: I6b7cc64262d2f8ef7e3bbce30bab5550899b5211
Change-Id: I15791a9238485190acf7f87a3b562bf67e7c5c09
This commit is contained in:
Clay Gerrard
2025-04-03 11:45:13 -05:00
parent 0e2791a88a
commit dd0ba770f7
2 changed files with 10 additions and 1 deletions

View File

@@ -11,6 +11,7 @@
vars: vars:
tox_environment: tox_environment:
TMPDIR: '{{ ansible_env.HOME }}/xfstmp' TMPDIR: '{{ ansible_env.HOME }}/xfstmp'
COLUMNS: 240
- job: - job:
name: swift-tox-py36 name: swift-tox-py36
@@ -237,6 +238,8 @@
- opendev.org/openstack/keystone - opendev.org/openstack/keystone
timeout: 5400 timeout: 5400
vars: vars:
tox_environment:
COLUMNS: 240
tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt' tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
# This tox env get run twice; once for Keystone and once for tempauth # This tox env get run twice; once for Keystone and once for tempauth
tox_envlist: func tox_envlist: func
@@ -274,6 +277,8 @@
Setup a SAIO dev environment and run ceph-s3tests Setup a SAIO dev environment and run ceph-s3tests
timeout: 5400 timeout: 5400
vars: vars:
tox_environment:
COLUMNS: 240
s3_acl: yes s3_acl: yes
bindep_profile: test py39 bindep_profile: test py39
pre-run: pre-run:
@@ -295,6 +300,8 @@
Setup a SAIO dev environment and run our s3api test suite Setup a SAIO dev environment and run our s3api test suite
timeout: 1800 timeout: 1800
vars: vars:
tox_environment:
COLUMNS: 240
s3_acl: yes s3_acl: yes
bindep_profile: test py39 bindep_profile: test py39
pre-run: pre-run:
@@ -316,6 +323,8 @@
under Python 3. under Python 3.
timeout: 7200 timeout: 7200
vars: vars:
tox_environment:
COLUMNS: 240
s3_acl: no s3_acl: no
bindep_profile: test py39 bindep_profile: test py39
pre-run: pre-run:

View File

@@ -24,13 +24,13 @@ allowlist_externals =
bash bash
find find
passenv = SWIFT_* passenv = SWIFT_*
COLUMNS
[testenv:s3api] [testenv:s3api]
usedevelop = False usedevelop = False
deps = {[testenv:py36]deps} deps = {[testenv:py36]deps}
commands = commands =
pytest {posargs:test/s3api} pytest {posargs:test/s3api}
passenv = SWIFT_*
# For some reason we hit some EPERM issue when building the package for these tests? # For some reason we hit some EPERM issue when building the package for these tests?
# (CentOS 8, CPython 3.6, tox 3.28.0) # (CentOS 8, CPython 3.6, tox 3.28.0)
skipsdist = True skipsdist = True