Cleanup tests

2026-06-20 11:32:56 +02:00 · 2016-03-03 18:47:12 +08:00
parent 529981af7a
commit 4e574e6b8e
7 changed files with 273 additions and 255 deletions
@@ -1,63 +1,58 @@
-import requests
-import pytest
-
 from httpie import ExitStatus
 from utils import TestEnvironment, http, HTTP_OK


-class TestExitStatus:
-    def test_ok_response_exits_0(self, httpbin):
-        r = http('GET', httpbin.url + '/status/200')
-        assert HTTP_OK in r
-        assert r.exit_status == ExitStatus.OK
+def test_ok_response_exits_0(httpbin):
+    r = http('GET', httpbin.url + '/status/200')
+    assert HTTP_OK in r
+    assert r.exit_status == ExitStatus.OK

-    def test_error_response_exits_0_without_check_status(self, httpbin):
-        r = http('GET', httpbin.url + '/status/500')
-        assert '500 INTERNAL SERVER ERRO' in r
-        assert r.exit_status == ExitStatus.OK
-        assert not r.stderr

-    @pytest.mark.skipif(
-        tuple(map(int, requests.__version__.split('.'))) < (2, 3, 0),
-        reason='timeout broken in requests prior v2.3.0 (#185)'
-    )
-    def test_timeout_exit_status(self, httpbin):
+def test_error_response_exits_0_without_check_status(httpbin):
+    r = http('GET', httpbin.url + '/status/500')
+    assert '500 INTERNAL SERVER ERRO' in r
+    assert r.exit_status == ExitStatus.OK
+    assert not r.stderr

-        r = http('--timeout=0.01', 'GET', httpbin.url + '/delay/0.02',
-                 error_exit_ok=True)
-        assert r.exit_status == ExitStatus.ERROR_TIMEOUT

-    def test_3xx_check_status_exits_3_and_stderr_when_stdout_redirected(
-            self, httpbin):
-        env = TestEnvironment(stdout_isatty=False)
-        r = http('--check-status', '--headers',
-                 'GET', httpbin.url + '/status/301',
-                 env=env, error_exit_ok=True)
-        assert '301 MOVED PERMANENTLY' in r
-        assert r.exit_status == ExitStatus.ERROR_HTTP_3XX
-        assert '301 moved permanently' in r.stderr.lower()
+def test_timeout_exit_status(httpbin):

-    @pytest.mark.skipif(
-        requests.__version__ == '0.13.6',
-        reason='Redirects with prefetch=False are broken in Requests 0.13.6')
-    def test_3xx_check_status_redirects_allowed_exits_0(self, httpbin):
-        r = http('--check-status', '--follow',
-                 'GET', httpbin.url + '/status/301',
-                 error_exit_ok=True)
-        # The redirect will be followed so 200 is expected.
-        assert HTTP_OK in r
-        assert r.exit_status == ExitStatus.OK
+    r = http('--timeout=0.01', 'GET', httpbin.url + '/delay/0.02',
+             error_exit_ok=True)
+    assert r.exit_status == ExitStatus.ERROR_TIMEOUT

-    def test_4xx_check_status_exits_4(self, httpbin):
-        r = http('--check-status', 'GET', httpbin.url + '/status/401',
-                 error_exit_ok=True)
-        assert '401 UNAUTHORIZED' in r
-        assert r.exit_status == ExitStatus.ERROR_HTTP_4XX
-        # Also stderr should be empty since stdout isn't redirected.
-        assert not r.stderr

-    def test_5xx_check_status_exits_5(self, httpbin):
-        r = http('--check-status', 'GET', httpbin.url + '/status/500',
-                 error_exit_ok=True)
-        assert '500 INTERNAL SERVER ERROR' in r
-        assert r.exit_status == ExitStatus.ERROR_HTTP_5XX
+def test_3xx_check_status_exits_3_and_stderr_when_stdout_redirected(
+        httpbin):
+    env = TestEnvironment(stdout_isatty=False)
+    r = http('--check-status', '--headers',
+             'GET', httpbin.url + '/status/301',
+             env=env, error_exit_ok=True)
+    assert '301 MOVED PERMANENTLY' in r
+    assert r.exit_status == ExitStatus.ERROR_HTTP_3XX
+    assert '301 moved permanently' in r.stderr.lower()
+
+
+def test_3xx_check_status_redirects_allowed_exits_0(httpbin):
+    r = http('--check-status', '--follow',
+             'GET', httpbin.url + '/status/301',
+             error_exit_ok=True)
+    # The redirect will be followed so 200 is expected.
+    assert HTTP_OK in r
+    assert r.exit_status == ExitStatus.OK
+
+
+def test_4xx_check_status_exits_4(httpbin):
+    r = http('--check-status', 'GET', httpbin.url + '/status/401',
+             error_exit_ok=True)
+    assert '401 UNAUTHORIZED' in r
+    assert r.exit_status == ExitStatus.ERROR_HTTP_4XX
+    # Also stderr should be empty since stdout isn't redirected.
+    assert not r.stderr
+
+
+def test_5xx_check_status_exits_5(httpbin):
+    r = http('--check-status', 'GET', httpbin.url + '/status/500',
+             error_exit_ok=True)
+    assert '500 INTERNAL SERVER ERROR' in r
+    assert r.exit_status == ExitStatus.ERROR_HTTP_5XX