Tests: style.

1 files changed, 93 insertions, 58 deletions

diff --git a/test/test_access_log.py b/test/test_access_log.py
index d6741c28..e0edd9fc 100644
--- a/test/test_access_log.py
+++ b/test/test_access_log.py
@@ -5,8 +5,8 @@ from subprocess import call
 import unittest
 import unit
 
-class TestUnitAccessLog(unit.TestUnitApplicationPython):
 
+class TestUnitAccessLog(unit.TestUnitApplicationPython):
     def setUpClass():
         unit.TestUnit().check_modules('python')
 
@@ -22,34 +22,45 @@ class TestUnitAccessLog(unit.TestUnitApplicationPython):
     def test_access_log_keepalive(self):
         self.load('mirror')
 
-        (resp, sock) = self.post(headers={
-            'Host': 'localhost',
-            'Connection': 'keep-alive',
-            'Content-Type': 'text/html'
-        }, start=True, body='01234')
+        (resp, sock) = self.post(
+            headers={
+                'Host': 'localhost',
+                'Connection': 'keep-alive',
+                'Content-Type': 'text/html',
+            },
+            start=True,
+            body='01234',
+        )
 
         time.sleep(0.2)
 
         self.assertIsNotNone(
-            self.search_in_log(r'"POST / HTTP/1.1" 200 5'), 'keepalive 1')
-
-        resp = self.post(headers={
-            'Host': 'localhost',
-            'Connection': 'close',
-            'Content-Type': 'text/html'
-        }, sock=sock, body='0123456789')
+            self.search_in_log(r'"POST / HTTP/1.1" 200 5'), 'keepalive 1'
+        )
+
+        resp = self.post(
+            headers={
+                'Host': 'localhost',
+                'Connection': 'close',
+                'Content-Type': 'text/html',
+            },
+            sock=sock,
+            body='0123456789',
+        )
 
         time.sleep(0.2)
 
         self.stop()
 
         self.assertIsNotNone(
-            self.search_in_log(r'"POST / HTTP/1.1" 200 10'), 'keepalive 2')
+            self.search_in_log(r'"POST / HTTP/1.1" 200 10'), 'keepalive 2'
+        )
 
     def test_access_log_pipeline(self):
         self.load('empty')
 
-        self.http(b"""GET / HTTP/1.1
+        self.http(
+            b"""GET / HTTP/1.1
 Host: localhost
 Referer: Referer-1
 
@@ -62,7 +73,10 @@ Host: localhost
 Referer: Referer-3
 Connection: close
 
-""", raw_resp=True, raw=True)
+""",
+            raw_resp=True,
+            raw=True,
+        )
 
         time.sleep(0.2)
 
@@ -70,22 +84,21 @@ Connection: close
 
         self.assertIsNotNone(
             self.search_in_log(r'"GET / HTTP/1.1" 200 0 "Referer-1" "-"'),
-            'pipeline 1')
+            'pipeline 1',
+        )
         self.assertIsNotNone(
             self.search_in_log(r'"GET / HTTP/1.1" 200 0 "Referer-2" "-"'),
-            'pipeline 2')
+            'pipeline 2',
+        )
         self.assertIsNotNone(
             self.search_in_log(r'"GET / HTTP/1.1" 200 0 "Referer-3" "-"'),
-            'pipeline 3')
+            'pipeline 3',
+        )
 
     def test_access_log_ipv6(self):
         self.load('empty')
 
-        self.conf({
-            "[::1]:7080": {
-                "application": "empty"
-            }
-        }, 'listeners')
+        self.conf({"[::1]:7080": {"application": "empty"}}, 'listeners')
 
         self.get(sock_type='ipv6')
 
@@ -95,18 +108,17 @@ Connection: close
 
         self.assertIsNotNone(
             self.search_in_log(
-                r'::1 - - \[.+\] "GET / HTTP/1.1" 200 0 "-" "-"'), 'ipv6')
+                r'::1 - - \[.+\] "GET / HTTP/1.1" 200 0 "-" "-"'
+            ),
+            'ipv6',
+        )
 
     def test_access_log_unix(self):
         self.load('empty')
 
         addr = self.testdir + '/sock'
 
-        self.conf({
-            "unix:" + addr: {
-                "application": "empty"
-            }
-        }, 'listeners')
+        self.conf({"unix:" + addr: {"application": "empty"}}, 'listeners')
 
         self.get(sock_type='unix', addr=addr)
 
@@ -114,17 +126,23 @@ Connection: close
 
         self.stop()
 
-        self.assertIsNotNone(self.search_in_log(
-            r'unix: - - \[.+\] "GET / HTTP/1.1" 200 0 "-" "-"'), 'unix')
+        self.assertIsNotNone(
+            self.search_in_log(
+                r'unix: - - \[.+\] "GET / HTTP/1.1" 200 0 "-" "-"'
+            ),
+            'unix',
+        )
 
     def test_access_log_referer(self):
         self.load('empty')
 
-        self.get(headers={
-            'Host': 'localhost',
-            'Referer': 'referer-value',
-            'Connection': 'close'
-        })
+        self.get(
+            headers={
+                'Host': 'localhost',
+                'Referer': 'referer-value',
+                'Connection': 'close',
+            }
+        )
 
         time.sleep(0.2)
 
@@ -132,16 +150,19 @@ Connection: close
 
         self.assertIsNotNone(
             self.search_in_log(r'"GET / HTTP/1.1" 200 0 "referer-value" "-"'),
-            'referer')
+            'referer',
+        )
 
     def test_access_log_user_agent(self):
         self.load('empty')
 
-        self.get(headers={
-            'Host': 'localhost',
-            'User-Agent': 'user-agent-value',
-            'Connection': 'close'
-        })
+        self.get(
+            headers={
+                'Host': 'localhost',
+                'User-Agent': 'user-agent-value',
+                'Connection': 'close',
+            }
+        )
 
         time.sleep(0.2)
 
@@ -149,7 +170,10 @@ Connection: close
 
         self.assertIsNotNone(
             self.search_in_log(
-                r'"GET / HTTP/1.1" 200 0 "-" "user-agent-value"'), 'user agent')
+                r'"GET / HTTP/1.1" 200 0 "-" "user-agent-value"'
+            ),
+            'user agent',
+        )
 
     def test_access_log_http10(self):
         self.load('empty')
@@ -161,8 +185,8 @@ Connection: close
         self.stop()
 
         self.assertIsNotNone(
-            self.search_in_log(
-                r'"GET / HTTP/1.0" 200 0 "-" "-"'), 'http 1.0')
+            self.search_in_log(r'"GET / HTTP/1.0" 200 0 "-" "-"'), 'http 1.0'
+        )
 
     def test_access_log_partial(self):
         self.load('empty')
@@ -174,7 +198,8 @@ Connection: close
         self.stop()
 
         self.assertIsNotNone(
-            self.search_in_log(r'"GE" 400 0 "-" "-"'), 'partial')
+            self.search_in_log(r'"GE" 400 0 "-" "-"'), 'partial'
+        )
 
     def test_access_log_partial_2(self):
         self.load('empty')
@@ -186,7 +211,8 @@ Connection: close
         self.stop()
 
         self.assertIsNotNone(
-            self.search_in_log(r'"GET /" 400 \d+ "-" "-"'), 'partial 2')
+            self.search_in_log(r'"GET /" 400 \d+ "-" "-"'), 'partial 2'
+        )
 
     def test_access_log_partial_3(self):
         self.load('empty')
@@ -198,7 +224,8 @@ Connection: close
         self.stop()
 
         self.assertIsNotNone(
-            self.search_in_log(r'"GET /" 400 0 "-" "-"'), 'partial 3')
+            self.search_in_log(r'"GET /" 400 0 "-" "-"'), 'partial 3'
+        )
 
     def test_access_log_partial_4(self):
         self.load('empty')
@@ -210,8 +237,8 @@ Connection: close
         self.stop()
 
         self.assertIsNotNone(
-            self.search_in_log(r'"GET / HTTP/1.1" 400 0 "-" "-"'),
-            'partial 4')
+            self.search_in_log(r'"GET / HTTP/1.1" 400 0 "-" "-"'), 'partial 4'
+        )
 
     def test_access_log_partial_5(self):
         self.load('empty')
@@ -221,7 +248,8 @@ Connection: close
         self.stop()
 
         self.assertIsNotNone(
-            self.search_in_log(r'"GET / HTTP/1.1" 200 0 "-" "-"'), 'partial 5')
+            self.search_in_log(r'"GET / HTTP/1.1" 200 0 "-" "-"'), 'partial 5'
+        )
 
     def test_access_log_get_parameters(self):
         self.load('empty')
@@ -234,8 +262,10 @@ Connection: close
 
         self.assertIsNotNone(
             self.search_in_log(
-                r'"GET /\?blah&var=val HTTP/1.1" 200 0 "-" "-"'),
-                'get parameters')
+                r'"GET /\?blah&var=val HTTP/1.1" 200 0 "-" "-"'
+            ),
+            'get parameters',
+        )
 
     def test_access_log_delete(self):
         self.load('empty')
@@ -265,7 +295,8 @@ Connection: close
 
         self.assertIsNotNone(
             self.search_in_log(r'"GET / HTTP/1.1" 200 0 "-" "-"', 'new.log'),
-            'change')
+            'change',
+        )
 
     def test_access_log_reopen(self):
         self.load('empty')
@@ -284,7 +315,8 @@ Connection: close
 
         self.assertIsNotNone(
             self.search_in_log(r'"GET / HTTP/1.1" 200 0 "-" "-"', 'new.log'),
-            'rename new')
+            'rename new',
+        )
         self.assertFalse(os.path.isfile(log_path), 'rename old')
 
         with open(self.testdir + '/unit.pid', 'r') as f:
@@ -299,10 +331,13 @@ Connection: close
         time.sleep(0.2)
 
         self.assertIsNone(
-            self.search_in_log(r'/usr1', 'new.log'), 'rename new 2')
+            self.search_in_log(r'/usr1', 'new.log'), 'rename new 2'
+        )
         self.assertIsNotNone(
             self.search_in_log(r'"GET /usr1 HTTP/1.1" 200 0 "-" "-"'),
-            'reopen 2')
+            'reopen 2',
+        )
+
 
 if __name__ == '__main__':
     TestUnitAccessLog.main()