style: whitespace & duplication in test fixtures

git ls-files -z "tests/requests/**.py" | xargs -0 sed -i -e '/^cfg = Config()$/d' -e '/^from gunicorn.config import Config$/d' -- git ls-files -z "tests/requests/**.py" | xargs -0 sed -z -i -e "s/''"'/""/g' -e 's/"\n\+}/",\n}/g' -e 's/)\n\+ \]/),\n ]/g' -- git ls-files -z "tests/requests/**.py" | xargs -0 python3 -m black --skip-string-normalization --line-length=120 --target-version=py37 -- git restore tests/requests/valid/{001..027}.py tests/requests/valid/{025_line,padding_01,100}.py tests/requests/invalid/{002,003,chunked_*,018,version_01,version_02,003c}.py tests/requests/invalid/{006..009}.py
benoitc · Aug 18, 2024 · 8d2b5c2 · 8d2b5c2
1 parent c8a3c70
commit 8d2b5c2
Show file tree

Hide file tree

Showing 94 changed files with 125 additions and 172 deletions.
diff --git a/tests/requests/invalid/001.py b/tests/requests/invalid/001.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import NoMoreData
-request = NoMoreData
+
+request = NoMoreData
diff --git a/tests/requests/invalid/002.py b/tests/requests/invalid/002.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidRequestLine
+
 request = InvalidRequestLine
diff --git a/tests/requests/invalid/003.py b/tests/requests/invalid/003.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidRequestLine
+
 request = InvalidRequestLine
diff --git a/tests/requests/invalid/003b.py b/tests/requests/invalid/003b.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidRequestMethod
-request = InvalidRequestMethod
+
+request = InvalidRequestMethod
diff --git a/tests/requests/invalid/003c.py b/tests/requests/invalid/003c.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidRequestMethod
+
 request = InvalidRequestMethod
diff --git a/tests/requests/invalid/004.py b/tests/requests/invalid/004.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHTTPVersion
-request = InvalidHTTPVersion
+
+request = InvalidHTTPVersion
diff --git a/tests/requests/invalid/005.py b/tests/requests/invalid/005.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHeaderName
-request = InvalidHeaderName
+
+request = InvalidHeaderName
diff --git a/tests/requests/invalid/006.py b/tests/requests/invalid/006.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import LimitRequestLine
+
 request = LimitRequestLine
diff --git a/tests/requests/invalid/007.py b/tests/requests/invalid/007.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import LimitRequestHeaders
+
 request = LimitRequestHeaders
diff --git a/tests/requests/invalid/008.py b/tests/requests/invalid/008.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import LimitRequestHeaders
+
 request = LimitRequestHeaders
diff --git a/tests/requests/invalid/009.py b/tests/requests/invalid/009.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import LimitRequestHeaders
+
 request = LimitRequestHeaders
diff --git a/tests/requests/invalid/010.py b/tests/requests/invalid/010.py
@@ -1,6 +1,4 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import LimitRequestHeaders
 
 request = LimitRequestHeaders
-cfg = Config()
 cfg.set('limit_request_field_size', 10)
diff --git a/tests/requests/invalid/011.py b/tests/requests/invalid/011.py
@@ -1,6 +1,4 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import LimitRequestHeaders
 
 request = LimitRequestHeaders
-cfg = Config()
 cfg.set('limit_request_fields', 2)
diff --git a/tests/requests/invalid/012.py b/tests/requests/invalid/012.py
@@ -1,6 +1,4 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import LimitRequestHeaders
 
 request = LimitRequestHeaders
-cfg = Config()
 cfg.set('limit_request_field_size', 98)
diff --git a/tests/requests/invalid/013.py b/tests/requests/invalid/013.py
@@ -1,8 +1,6 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import LimitRequestHeaders
 
 request = LimitRequestHeaders
-cfg = Config()
 cfg.set('limit_request_field_size', 14)
 
 # once this option is removed, this test should not be dropped;

diff --git a/tests/requests/invalid/017.py b/tests/requests/invalid/017.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import LimitRequestHeaders
 
-cfg = Config()
 request = LimitRequestHeaders
diff --git a/tests/requests/invalid/018.py b/tests/requests/invalid/018.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHTTPVersion
+
 request = InvalidHTTPVersion
diff --git a/tests/requests/invalid/019.py b/tests/requests/invalid/019.py
@@ -1,6 +1,4 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidSchemeHeaders
 
 request = InvalidSchemeHeaders
-cfg = Config()
 cfg.set('forwarded_allow_ips', '*')
diff --git a/tests/requests/invalid/020.py b/tests/requests/invalid/020.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeaderName
 
-cfg = Config()
 request = InvalidHeaderName
diff --git a/tests/requests/invalid/021.py b/tests/requests/invalid/021.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader
diff --git a/tests/requests/invalid/022.py b/tests/requests/invalid/022.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader
diff --git a/tests/requests/invalid/023.py b/tests/requests/invalid/023.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader
diff --git a/tests/requests/invalid/024.py b/tests/requests/invalid/024.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader
diff --git a/tests/requests/invalid/040.py b/tests/requests/invalid/040.py
@@ -1,7 +1,5 @@
 from gunicorn.http.errors import InvalidHeaderName
-from gunicorn.config import Config
 
-cfg = Config()
 cfg.set("header_map", "refuse")
 
 request = InvalidHeaderName
diff --git a/tests/requests/invalid/chunked_01.py b/tests/requests/invalid/chunked_01.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize
diff --git a/tests/requests/invalid/chunked_02.py b/tests/requests/invalid/chunked_02.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHeader
+
 request = InvalidHeader
diff --git a/tests/requests/invalid/chunked_03.py b/tests/requests/invalid/chunked_03.py
@@ -1,2 +1,3 @@
-from gunicorn.http.errors import InvalidHeader 
-request = InvalidHeader 
+from gunicorn.http.errors import InvalidHeader
+
+request = InvalidHeader
diff --git a/tests/requests/invalid/chunked_04.py b/tests/requests/invalid/chunked_04.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHeader
+
 request = InvalidHeader
diff --git a/tests/requests/invalid/chunked_05.py b/tests/requests/invalid/chunked_05.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHeader
+
 request = InvalidHeader
diff --git a/tests/requests/invalid/chunked_06.py b/tests/requests/invalid/chunked_06.py
@@ -1,2 +1,3 @@
-from gunicorn.http.errors import InvalidHeader 
-request = InvalidHeader 
+from gunicorn.http.errors import InvalidHeader
+
+request = InvalidHeader
diff --git a/tests/requests/invalid/chunked_07.py b/tests/requests/invalid/chunked_07.py
@@ -1,7 +1,5 @@
 from gunicorn.http.errors import InvalidHeaderName
-from gunicorn.config import Config
 
-cfg = Config()
 cfg.set("header_map", "refuse")
 
 request = InvalidHeaderName
diff --git a/tests/requests/invalid/chunked_08.py b/tests/requests/invalid/chunked_08.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHeader
+
 request = InvalidHeader
diff --git a/tests/requests/invalid/chunked_09.py b/tests/requests/invalid/chunked_09.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize
diff --git a/tests/requests/invalid/chunked_10.py b/tests/requests/invalid/chunked_10.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize
diff --git a/tests/requests/invalid/chunked_11.py b/tests/requests/invalid/chunked_11.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize
diff --git a/tests/requests/invalid/chunked_12.py b/tests/requests/invalid/chunked_12.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize
diff --git a/tests/requests/invalid/chunked_13.py b/tests/requests/invalid/chunked_13.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize
diff --git a/tests/requests/invalid/invalid_field_value_01.py b/tests/requests/invalid/invalid_field_value_01.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader
diff --git a/tests/requests/invalid/nonascii_01.py b/tests/requests/invalid/nonascii_01.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidRequestMethod
 
-cfg = Config()
 request = InvalidRequestMethod
diff --git a/tests/requests/invalid/nonascii_02.py b/tests/requests/invalid/nonascii_02.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidRequestMethod
 
-cfg = Config()
 request = InvalidRequestMethod
diff --git a/tests/requests/invalid/nonascii_03.py b/tests/requests/invalid/nonascii_03.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeaderName
 
-cfg = Config()
 request = InvalidHeaderName
diff --git a/tests/requests/invalid/nonascii_04.py b/tests/requests/invalid/nonascii_04.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeaderName
 
-cfg = Config()
 request = InvalidHeaderName
diff --git a/tests/requests/invalid/pp_01.py b/tests/requests/invalid/pp_01.py
@@ -1,7 +1,5 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidProxyLine
 
-cfg = Config()
 cfg.set("proxy_protocol", True)
 
 request = InvalidProxyLine
diff --git a/tests/requests/invalid/pp_02.py b/tests/requests/invalid/pp_02.py
@@ -1,7 +1,5 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidProxyLine
 
-cfg = Config()
 cfg.set('proxy_protocol', True)
 
 request = InvalidProxyLine
diff --git a/tests/requests/invalid/prefix_01.py b/tests/requests/invalid/prefix_01.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidRequestMethod
-request = InvalidRequestMethod
+
+request = InvalidRequestMethod
diff --git a/tests/requests/invalid/prefix_02.py b/tests/requests/invalid/prefix_02.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidRequestMethod
-request = InvalidRequestMethod
+
+request = InvalidRequestMethod
diff --git a/tests/requests/invalid/prefix_03.py b/tests/requests/invalid/prefix_03.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader
diff --git a/tests/requests/invalid/prefix_04.py b/tests/requests/invalid/prefix_04.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader
diff --git a/tests/requests/invalid/prefix_05.py b/tests/requests/invalid/prefix_05.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidRequestMethod
 
-cfg = Config()
 request = InvalidRequestMethod
diff --git a/tests/requests/invalid/prefix_06.py b/tests/requests/invalid/prefix_06.py
@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHTTPVersion
 
-cfg = Config()
 request = InvalidHTTPVersion
diff --git a/tests/requests/invalid/version_01.py b/tests/requests/invalid/version_01.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHTTPVersion
+
 request = InvalidHTTPVersion
diff --git a/tests/requests/invalid/version_02.py b/tests/requests/invalid/version_02.py
@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHTTPVersion
+
 request = InvalidHTTPVersion
diff --git a/tests/requests/valid/001.py b/tests/requests/valid/001.py
@@ -5,7 +5,7 @@
     "headers": [
         ("SERVER", "http://127.0.0.1:5984"),
         ("CONTENT-TYPE", "application/json"),
-        ("CONTENT-LENGTH", "14")
+        ("CONTENT-LENGTH", "14"),
     ],
-    "body": b'{"nom": "nom"}'
+    "body": b'{"nom": "nom"}',
 }
diff --git a/tests/requests/valid/002.py b/tests/requests/valid/002.py
@@ -5,7 +5,7 @@
     "headers": [
         ("USER-AGENT", "curl/7.18.0 (i486-pc-linux-gnu) libcurl/7.18.0 OpenSSL/0.9.8g zlib/1.2.3.3 libidn/1.1"),
         ("HOST", "0.0.0.0=5000"),
-        ("ACCEPT", "*/*")
+        ("ACCEPT", "*/*"),
     ],
-    "body": b""
+    "body": b"",
 }
diff --git a/tests/requests/valid/003.py b/tests/requests/valid/003.py
@@ -10,7 +10,7 @@
         ("ACCEPT-ENCODING", "gzip,deflate"),
         ("ACCEPT-CHARSET", "ISO-8859-1,utf-8;q=0.7,*;q=0.7"),
         ("KEEP-ALIVE", "300"),
-        ("CONNECTION", "keep-alive")
+        ("CONNECTION", "keep-alive"),
     ],
-    "body": b""
+    "body": b"",
 }
diff --git a/tests/requests/valid/004.py b/tests/requests/valid/004.py
@@ -3,7 +3,7 @@
     "uri": uri("/silly"),
     "version": (1, 1),
     "headers": [
-        ("AAAAAAAAAAAAA", "++++++++++")
+        ("AAAAAAAAAAAAA", "++++++++++"),
     ],
-    "body": b""
+    "body": b"",
 }
diff --git a/tests/requests/valid/005.py b/tests/requests/valid/005.py
@@ -3,5 +3,5 @@
     "uri": uri("/forums/1/topics/2375?page=1#posts-17408"),
     "version": (1, 1),
     "headers": [],
-    "body": b""
+    "body": b"",
 }
diff --git a/tests/requests/valid/006.py b/tests/requests/valid/006.py
@@ -3,5 +3,5 @@
     "uri": uri("/get_no_headers_no_body/world"),
     "version": (1, 1),
     "headers": [],
-    "body": b""
+    "body": b"",
 }
diff --git a/tests/requests/valid/007.py b/tests/requests/valid/007.py
@@ -3,7 +3,7 @@
     "uri": uri("/get_one_header_no_body"),
     "version": (1, 1),
     "headers": [
-        ("ACCEPT", "*/*")
+        ("ACCEPT", "*/*"),
     ],
-    "body": b""
+    "body": b"",
 }
diff --git a/tests/requests/valid/008.py b/tests/requests/valid/008.py
@@ -3,7 +3,7 @@
     "uri": uri("/unusual_content_length"),
     "version": (1, 0),
     "headers": [
-        ("CONTENT-LENGTH", "5")
+        ("CONTENT-LENGTH", "5"),
     ],
-    "body": b"HELLO"
+    "body": b"HELLO",
 }
diff --git a/tests/requests/valid/009.py b/tests/requests/valid/009.py
@@ -5,7 +5,7 @@
     "headers": [
         ("ACCEPT", "*/*"),
         ("TRANSFER-ENCODING", "identity"),
-        ("CONTENT-LENGTH", "5")
+        ("CONTENT-LENGTH", "5"),
     ],
-    "body": b"World"
+    "body": b"World",
 }
diff --git a/tests/requests/valid/010.py b/tests/requests/valid/010.py
@@ -5,5 +5,5 @@
     "headers": [
         ("TRANSFER-ENCODING", "chunked"),
     ],
-    "body": b"all your base are belong to us"
+    "body": b"all your base are belong to us",
 }
diff --git a/tests/requests/valid/011.py b/tests/requests/valid/011.py
@@ -3,7 +3,7 @@
     "uri": uri("/two_chunks_mult_zero_end"),
     "version": (1, 1),
     "headers": [
-        ("TRANSFER-ENCODING", "chunked")
+        ("TRANSFER-ENCODING", "chunked"),
     ],
-    "body": b"hello world"
+    "body": b"hello world",
 }