Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion httpie/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def as_silent(self) -> Iterator[None]:
self.stderr = original_stderr

def log_error(self, msg: str, level: LogLevel = LogLevel.ERROR) -> None:
if self.stdout_isatty and self.quiet >= LOG_LEVEL_DISPLAY_THRESHOLDS[level]:
if self.quiet >= LOG_LEVEL_DISPLAY_THRESHOLDS[level]:
stderr = self.stderr # Not directly /dev/null, since stderr might be mocked
else:
stderr = self._orig_stderr
Expand Down
58 changes: 58 additions & 0 deletions tests/test_log_error.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import io
import pytest
from httpie.context import LogLevel
from tests.utils import MockEnvironment


@pytest.mark.parametrize('stdout_isatty', [True, False])
def test_log_error_warning_suppression_with_quiet(stdout_isatty):
orig_stderr = io.StringIO()
quiet_stderr = io.StringIO()
env = MockEnvironment(
stdout_isatty=stdout_isatty,
stderr=quiet_stderr,
)
env._orig_stderr = orig_stderr
env.quiet = 2

env.log_error('test warning message', level=LogLevel.WARNING)

# When quiet >= threshold (2 for WARNING), warning should go to env.stderr (devnull in real run),
# not _orig_stderr, regardless of whether stdout is a tty or redirected (#1978).
assert 'test warning message' not in orig_stderr.getvalue()
assert 'test warning message' in quiet_stderr.getvalue()


@pytest.mark.parametrize('stdout_isatty', [True, False])
def test_log_error_warning_printed_without_quiet(stdout_isatty):
orig_stderr = io.StringIO()
quiet_stderr = io.StringIO()
env = MockEnvironment(
stdout_isatty=stdout_isatty,
stderr=quiet_stderr,
)
env._orig_stderr = orig_stderr
env.quiet = 0

env.log_error('test warning message', level=LogLevel.WARNING)

assert 'test warning message' in orig_stderr.getvalue()
assert 'test warning message' not in quiet_stderr.getvalue()


@pytest.mark.parametrize('stdout_isatty', [True, False])
def test_log_error_error_never_suppressed(stdout_isatty):
orig_stderr = io.StringIO()
quiet_stderr = io.StringIO()
env = MockEnvironment(
stdout_isatty=stdout_isatty,
stderr=quiet_stderr,
)
env._orig_stderr = orig_stderr
env.quiet = 2

env.log_error('critical failure', level=LogLevel.ERROR)

# Errors should never be hidden regardless of quiet setting or redirection
assert 'critical failure' in orig_stderr.getvalue()
assert 'critical failure' not in quiet_stderr.getvalue()
Loading