Skip to content

Small test cleanup #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akx merged 4 commits into from
Jan 15, 2025
Merged

Small test cleanup #1172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b41f8d
Configure Ruff formatter to preserve quotes for now
akx Jan 14, 2025
a5b1bbf
Split support functionality tests to a separate modules
akx Jan 14, 2025
f116681
Use standard `monkeypatch` fixture for `os.environ` patching
akx Jan 14, 2025
2a8cf0e
Use even more `monkeypatch` for patching
akx Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import os

import pytest

try:
Expand All @@ -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:
Expand Down
25 changes: 12 additions & 13 deletions tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand All @@ -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')

Expand Down Expand Up @@ -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'


Expand Down
Loading