python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2024-11-21 17:16:30 +02:00
Code

Rework __main__.py to follow best practices (#1124)

Browse Source 
It also simplifies how the `main()` function could be tested.
This commit is contained in:
Mickaël Schoentgen 2021-08-06 16:57:19 +02:00 committed by GitHub
parent c50e287c57
commit 4ff22defe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
httpie/__main__.py
View File

@ -1,7 +1,6 @@
"""The main entry point. Invoke as `http' or `python -m httpie'.
"""
import sys
def main():
@ -12,8 +11,9 @@ def main():
from httpie.status import ExitStatus
exit_status = ExitStatus.ERROR_CTRL_C
sys.exit(exit_status.value)
return exit_status.value
if __name__ == '__main__':
main()
if __name__ == '__main__': # pragma: nocover
import sys
sys.exit(main())

8
tests/test_httpie.py
View File

@ -17,18 +17,14 @@ from .utils import HTTP_OK, MockEnvironment, StdinBytesIO, http
def test_main_entry_point():
# Patch stdin to bypass pytest capture
with mock.patch.object(Environment, 'stdin', io.StringIO()):
with pytest.raises(SystemExit) as e:
httpie.__main__.main()
assert e.value.code == ExitStatus.ERROR
assert httpie.__main__.main() == ExitStatus.ERROR.value
@mock.patch('httpie.core.main')
def test_main_entry_point_keyboard_interrupt(main):
main.side_effect = KeyboardInterrupt()
with mock.patch.object(Environment, 'stdin', io.StringIO()):
with pytest.raises(SystemExit) as e:
httpie.__main__.main()
assert e.value.code == ExitStatus.ERROR_CTRL_C
assert httpie.__main__.main() == ExitStatus.ERROR_CTRL_C.value
def test_debug():