bpo-44647: Add a permanent Unicode-valued env var to regrtest (GH-27187) (#27191)
(cherry picked from commit 7915c96ffd7ddc5cb6d54015ee4c31255a416892)
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index 83ce2f7..472c6eb 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -14,6 +14,9 @@
setup_threading_excepthook)
+UNICODE_GUARD_ENV = "PYTHONREGRTEST_UNICODE_GUARD"
+
+
def setup_tests(ns):
try:
stderr_fd = sys.__stderr__.fileno()
@@ -99,6 +102,13 @@ def _test_audit_hook(name, args):
from test.support.testresult import RegressionTestResult
RegressionTestResult.USE_XML = True
+ # Ensure there's a non-ASCII character in env vars at all times to force
+ # tests consider this case. See BPO-44647 for details.
+ os.environ.setdefault(
+ UNICODE_GUARD_ENV,
+ "\N{SMILING FACE WITH SUNGLASSES}",
+ )
+
def replace_stdout():
"""Set stdout encoder error handler to backslashreplace (as stderr error
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index 054776c..75fa6f2 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -19,7 +19,7 @@
from test import libregrtest
from test import support
from test.support import os_helper
-from test.libregrtest import utils
+from test.libregrtest import utils, setup
Py_DEBUG = hasattr(sys, 'gettotalrefcount')
@@ -1298,6 +1298,14 @@ def test_threading_excepthook(self):
self.assertIn("Warning -- Uncaught thread exception", output)
self.assertIn("Exception: bug in thread", output)
+ def test_unicode_guard_env(self):
+ guard = os.environ.get(setup.UNICODE_GUARD_ENV)
+ self.assertIsNotNone(guard, f"{setup.UNICODE_GUARD_ENV} not set")
+ if guard != "\N{SMILING FACE WITH SUNGLASSES}":
+ # Skip to signify that the env var value was changed by the user;
+ # possibly to something ASCII to work around Unicode issues.
+ self.skipTest("Modified guard")
+
def test_cleanup(self):
dirname = os.path.join(self.tmptestdir, "test_python_123")
os.mkdir(dirname)