Small test cleanup (#1172)

* Configure Ruff formatter to preserve quotes for now
* Split support functionality tests to a separate modules
* Use standard `monkeypatch` fixture for `os.environ` patching
* Use even more `monkeypatch` for patching

---------

Co-authored-by: Tomas R. <tomas.roun8@gmail.com>

Author: akx

pyproject.toml

@@ -4,6 +4,9 @@ extend-exclude = [
     "tests/messages/data",
 ]
 
+[tool.ruff.format]
+quote-style = "preserve"
+
 [tool.ruff.lint]
 select = [
     "B",

tests/conftest.py

@@ -1,5 +1,3 @@
-import os
-
 import pytest
 
 try:
@@ -16,13 +14,6 @@
     pytz = None
 
 
-@pytest.fixture
-def os_environ(monkeypatch):
-    mock_environ = dict(os.environ)
-    monkeypatch.setattr(os, 'environ', mock_environ)
-    return mock_environ
-
-
 def pytest_generate_tests(metafunc):
     if hasattr(metafunc.function, "pytestmark"):
         for mark in metafunc.function.pytestmark:

tests/messages/test_setuptools_frontend.py

@@ -56,12 +56,11 @@ def test_setuptools_commands(tmp_path, monkeypatch):
     shutil.copytree(data_dir, dest)
     monkeypatch.chdir(dest)
 
-    env = os.environ.copy()
     # When in Tox, we need to hack things a bit so as not to have the
     # sub-interpreter `sys.executable` use the tox virtualenv's Babel
     # installation, so the locale data is where we expect it to be.
-    if "BABEL_TOX_INI_DIR" in env:
-        env["PYTHONPATH"] = env["BABEL_TOX_INI_DIR"]
+    if "BABEL_TOX_INI_DIR" in os.environ:
+        monkeypatch.setenv("PYTHONPATH", os.environ["BABEL_TOX_INI_DIR"])
 
     # Initialize an empty catalog
     subprocess.check_call([
@@ -71,15 +70,15 @@ def test_setuptools_commands(tmp_path, monkeypatch):
         "-i", os.devnull,
         "-l", "fi",
         "-d", "inited",
-    ], env=env)
+    ])
     po_file = Path("inited/fi/LC_MESSAGES/messages.po")
     orig_po_data = po_file.read_text()
     subprocess.check_call([
         sys.executable,
         "setup.py",
         "extract_messages",
         "-o", "extracted.pot",
-    ], env=env)
+    ])
     pot_file = Path("extracted.pot")
     pot_data = pot_file.read_text()
     assert "FooBar, TM" in pot_data  # should be read from setup.cfg
@@ -90,13 +89,13 @@ def test_setuptools_commands(tmp_path, monkeypatch):
         "update_catalog",
         "-i", "extracted.pot",
         "-d", "inited",
-    ], env=env)
+    ])
     new_po_data = po_file.read_text()
     assert new_po_data != orig_po_data  # check we updated the file
     subprocess.check_call([
         sys.executable,
         "setup.py",
         "compile_catalog",
         "-d", "inited",
-    ], env=env)
+    ])
     assert po_file.with_suffix(".mo").exists()

tests/test_core.py

@@ -42,15 +42,15 @@ def test_locale_comparison():
     assert fi_FI != bad_en_US
 
 
-def test_can_return_default_locale(os_environ):
-    os_environ['LC_MESSAGES'] = 'fr_FR.UTF-8'
+def test_can_return_default_locale(monkeypatch):
+    monkeypatch.setenv('LC_MESSAGES', 'fr_FR.UTF-8')
     assert Locale('fr', 'FR') == Locale.default('LC_MESSAGES')
 
 
-def test_ignore_invalid_locales_in_lc_ctype(os_environ):
+def test_ignore_invalid_locales_in_lc_ctype(monkeypatch):
     # This is a regression test specifically for a bad LC_CTYPE setting on
     # MacOS X 10.6 (#200)
-    os_environ['LC_CTYPE'] = 'UTF-8'
+    monkeypatch.setenv('LC_CTYPE', 'UTF-8')
     # must not throw an exception
     default_locale('LC_CTYPE')
 
@@ -76,10 +76,10 @@ def test_attributes(self):
         assert locale.language == 'en'
         assert locale.territory == 'US'
 
-    def test_default(self, os_environ):
+    def test_default(self, monkeypatch):
         for name in ['LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LC_MESSAGES']:
-            os_environ[name] = ''
-        os_environ['LANG'] = 'fr_FR.UTF-8'
+            monkeypatch.setenv(name, '')
+        monkeypatch.setenv('LANG', 'fr_FR.UTF-8')
         default = Locale.default('LC_MESSAGES')
         assert (default.language, default.territory) == ('fr', 'FR')
 
@@ -264,17 +264,16 @@ def test_plural_form_property(self):
         assert Locale('ru').plural_form(100) == 'many'
 
 
-def test_default_locale(os_environ):
+def test_default_locale(monkeypatch):
     for name in ['LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LC_MESSAGES']:
-        os_environ[name] = ''
-    os_environ['LANG'] = 'fr_FR.UTF-8'
+        monkeypatch.setenv(name, '')
+    monkeypatch.setenv('LANG', 'fr_FR.UTF-8')
     assert default_locale('LC_MESSAGES') == 'fr_FR'
-
-    os_environ['LC_MESSAGES'] = 'POSIX'
+    monkeypatch.setenv('LC_MESSAGES', 'POSIX')
     assert default_locale('LC_MESSAGES') == 'en_US_POSIX'
 
     for value in ['C', 'C.UTF-8', 'POSIX']:
-        os_environ['LANGUAGE'] = value
+        monkeypatch.setenv('LANGUAGE', value)
         assert default_locale() == 'en_US_POSIX'