We should use os_helper.EnvironmentVarGuard() instead of manually messing with os.environ.

Thanks for this one. I didn't know whether we had something like that somewhere but you found what I wanted to emulate with mock.patch.dict.

@ZeroIntensity thanks for pointing to that

Now that you're raising this issue, I'd actually prefer skipping it. If the test is broken when you use PYTHONUNBUFFERED=1 (broken because of unsatisfied pre-requirements, namely it could never work with this configuration), then it's probably fine to just skip it. Changing locally the environment is like saying "hey, you run the test suite with this configuration, but this test is not compatible with that configuration, so we'll temporarily change your configuration so that the test can run".

So yes, let's just skip the test.

Sorry linter failed, did not have pre-commit hooks installed. Will fix asap

Thanks. I'll merge this one tomorrow (I'll write a nice commit message).

Having fun with your commit privileges already I see 😄

Thank you for the fix and the reviews!

Btw, can you check if we actually need to backport this test? If so, I'll apply the backport labels and close the issue accordingly.