test: setting COLUMNS=80 broadly makes pytest too narrow

Better to set it precisely where it is needed. This also ensures that running
cog from the Makefile will get the right results.

2 files changed, 6 insertions, 3 deletions

diff --git a/doc/cmd.rst b/doc/cmd.rst
index 663ca708..c1f52ee7 100644
--- a/doc/cmd.rst
+++ b/doc/cmd.rst
@@ -6,6 +6,12 @@
    Running "make prebuild" will bring it up to date.
 
 .. [[[cog
+    # optparse wraps help to the COLUMNS value.  Set it here to be sure it's
+    # consistent regardless of the environment.  Has to be set before we
+    # import cmdline.py, which creates the optparse objects.
+    import os
+    os.environ["COLUMNS"] = "80"
+
     import contextlib
     import io
     import re
diff --git a/tox.ini b/tox.ini
index 97aa021f..4a410aa7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,9 +31,6 @@ setenv =
     # For some tests, we need .pyc files written in the current directory,
     # so override any local setting.
     PYTHONPYCACHEPREFIX=
-    # Cog'ing the --help output depends on the width of the terminal,
-    # so set it explicitly to avoid environmental interference
-    COLUMNS=80
 
 commands =
     # Create tests/zipmods.zip