From dd0ba770f70507cd71d8342e4b325ee50b628b9a Mon Sep 17 00:00:00 2001
From: Clay Gerrard <clay.gerrard@gmail.com>
Date: Thu, 3 Apr 2025 11:45:13 -0500
Subject: [PATCH] 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
---
 .zuul.yaml | 9 +++++++++
 tox.ini    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index a0408887ba..a5d4f6895f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,6 +11,7 @@
     vars:
       tox_environment:
         TMPDIR: '{{ ansible_env.HOME }}/xfstmp'
+        COLUMNS: 240
 
 - job:
     name: swift-tox-py36
@@ -237,6 +238,8 @@
       - opendev.org/openstack/keystone
     timeout: 5400
     vars:
+      tox_environment:
+        COLUMNS: 240
       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
       tox_envlist: func
@@ -274,6 +277,8 @@
       Setup a SAIO dev environment and run ceph-s3tests
     timeout: 5400
     vars:
+      tox_environment:
+        COLUMNS: 240
       s3_acl: yes
       bindep_profile: test py39
     pre-run:
@@ -295,6 +300,8 @@
       Setup a SAIO dev environment and run our s3api test suite
     timeout: 1800
     vars:
+      tox_environment:
+        COLUMNS: 240
       s3_acl: yes
       bindep_profile: test py39
     pre-run:
@@ -316,6 +323,8 @@
       under Python 3.
     timeout: 7200
     vars:
+      tox_environment:
+        COLUMNS: 240
       s3_acl: no
       bindep_profile: test py39
     pre-run:
diff --git a/tox.ini b/tox.ini
index 5d979e92c7..a2ff64d3c6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,13 +24,13 @@ allowlist_externals =
   bash
   find
 passenv = SWIFT_*
+          COLUMNS
 
 [testenv:s3api]
 usedevelop = False
 deps = {[testenv:py36]deps}
 commands =
   pytest {posargs:test/s3api}
-passenv = SWIFT_*
 # For some reason we hit some EPERM issue when building the package for these tests?
 # (CentOS 8, CPython 3.6, tox 3.28.0)
 skipsdist = True