Merged with the default branch.

1 files changed, 31 insertions, 82 deletions

diff --git a/test/test_proxy.py b/test/test_proxy.py
index 74bd0873..feec1ac4 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -1,12 +1,13 @@
 import re
-import time
 import socket
+import time
 import unittest
+
 from unit.applications.lang.python import TestApplicationPython
 
 
 class TestProxy(TestApplicationPython):
-    prerequisites = {'modules': ['python']}
+    prerequisites = {'modules': {'python': 'any'}}
 
     SERVER_PORT = 7999
 
@@ -521,88 +522,35 @@ Content-Length: 10
         self.assertEqual(len(resp['body']), 10, 'body gt Content-Length 15')
 
     def test_proxy_invalid(self):
-        self.assertIn(
-            'error',
-            self.conf([{"action": {"proxy": 'blah'}}], 'routes'),
-            'proxy invalid',
-        )
-        self.assertIn(
-            'error',
-            self.conf([{"action": {"proxy": '/blah'}}], 'routes'),
-            'proxy invalid 2',
-        )
-        self.assertIn(
-            'error',
-            self.conf([{"action": {"proxy": 'unix:/blah'}}], 'routes'),
-            'proxy unix invalid 2',
-        )
-        self.assertIn(
-            'error',
-            self.conf([{"action": {"proxy": 'http://blah'}}], 'routes'),
-            'proxy unix invalid 3',
-        )
-        self.assertIn(
-            'error',
-            self.conf([{"action": {"proxy": 'http://127.0.0.1'}}], 'routes'),
-            'proxy ipv4 invalid',
-        )
-        self.assertIn(
-            'error',
-            self.conf([{"action": {"proxy": 'http://127.0.0.1:'}}], 'routes'),
-            'proxy ipv4 invalid 2',
-        )
-        self.assertIn(
-            'error',
-            self.conf(
-                [{"action": {"proxy": 'http://127.0.0.1:blah'}}], 'routes'
-            ),
-            'proxy ipv4 invalid 3',
-        )
-        self.assertIn(
-            'error',
-            self.conf(
-                [{"action": {"proxy": 'http://127.0.0.1:-1'}}], 'routes'
-            ),
-            'proxy ipv4 invalid 4',
-        )
-        self.assertIn(
-            'error',
-            self.conf(
-                [{"action": {"proxy": 'http://127.0.0.1:7080b'}}], 'routes'
-            ),
-            'proxy ipv4 invalid 5',
-        )
-        self.assertIn(
-            'error',
-            self.conf(
-                [{"action": {"proxy": 'http://[]'}}], 'routes'
-            ),
-            'proxy ipv6 invalid',
-        )
-        self.assertIn(
-            'error',
-            self.conf(
-                [{"action": {"proxy": 'http://[]:7080'}}], 'routes'
-            ),
-            'proxy ipv6 invalid 2',
-        )
-        self.assertIn(
-            'error',
-            self.conf(
-                [{"action": {"proxy": 'http://[:]:7080'}}], 'routes'
-            ),
-            'proxy ipv6 invalid 3',
-        )
-        self.assertIn(
-            'error',
-            self.conf(
-                [{"action": {"proxy": 'http://[::7080'}}], 'routes'
-            ),
-            'proxy ipv6 invalid 4',
-        )
+        def check_proxy(proxy):
+            self.assertIn(
+                'error',
+                self.conf([{"action": {"proxy": proxy}}], 'routes'),
+                'proxy invalid',
+            )
+
+        check_proxy('blah')
+        check_proxy('/blah')
+        check_proxy('unix:/blah')
+        check_proxy('http://blah')
+        check_proxy('http://127.0.0.1')
+        check_proxy('http://127.0.0.1:')
+        check_proxy('http://127.0.0.1:blah')
+        check_proxy('http://127.0.0.1:-1')
+        check_proxy('http://127.0.0.1:7080b')
+        check_proxy('http://[]')
+        check_proxy('http://[]:7080')
+        check_proxy('http://[:]:7080')
+        check_proxy('http://[::7080')
 
-    @unittest.skip('not yet')
     def test_proxy_loop(self):
+        self.skip_alerts.extend(
+            [
+                r'socket.*failed',
+                r'accept.*failed',
+                r'new connections are not accepted',
+            ]
+        )
         self.conf(
             {
                 "listeners": {
@@ -625,6 +573,7 @@ Content-Length: 10
         )
 
         self.get_http10(no_recv=True)
+        self.get_http10(read_timeout=1)
 
 if __name__ == '__main__':
     TestProxy.main()