diff options
| author | Andrei Zeliankou <zelenkov@nginx.com> | 2020-04-20 14:04:55 +0100 |
|---|---|---|
| committer | Andrei Zeliankou <zelenkov@nginx.com> | 2020-04-20 14:04:55 +0100 |
| commit | 8f6e6086cb7bceeff6eec7cf0a2e3ff94f8d7705 (patch) | |
| tree | 8251ab3d737d93cdc7ac062b409ec4e6ecd2a388 | |
| parent | 9877087756144d3bdf343d0d4e91e1efbcc62c93 (diff) | |
| download | unit-8f6e6086cb7bceeff6eec7cf0a2e3ff94f8d7705.tar.gz unit-8f6e6086cb7bceeff6eec7cf0a2e3ff94f8d7705.tar.bz2 | |
Tests: skips adjusted.
| -rw-r--r-- | test/test_proxy.py | 9 | ||||
| -rw-r--r-- | test/test_share_fallback.py | 21 |
2 files changed, 21 insertions, 9 deletions
diff --git a/test/test_proxy.py b/test/test_proxy.py index 74bd0873..b539d5f6 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -601,8 +601,14 @@ Content-Length: 10 'proxy ipv6 invalid 4', ) - @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 +631,7 @@ Content-Length: 10 ) self.get_http10(no_recv=True) + self.get_http10(read_timeout=1) if __name__ == '__main__': TestProxy.main() diff --git a/test/test_share_fallback.py b/test/test_share_fallback.py index c51e43ee..3f288d89 100644 --- a/test/test_share_fallback.py +++ b/test/test_share_fallback.py @@ -125,18 +125,23 @@ class TestStatic(TestApplicationProto): self.assertEqual(resp['status'], 200, 'fallback proxy status') self.assertEqual(resp['body'], '', 'fallback proxy') - @unittest.skip('not yet') - def test_fallback_proxy_cycle(self): + def test_fallback_proxy_loop(self): + self.skip_alerts.extend( + [ + r'open.*/blah/index.html.*failed', + r'accept.*failed', + r'socket.*failed', + r'new connections are not accepted', + ] + ) + self.action_update( - { - "share": "/blah", - "fallback": {"proxy": "http://127.0.0.1:7080"}, - } + {"share": "/blah", "fallback": {"proxy": "http://127.0.0.1:7080"}} ) - self.assertNotEqual(self.get()['status'], 200, 'fallback cycle') + self.get(no_recv=True) self.assertIn('success', self.conf_delete('listeners/*:7081')) - self.assertNotEqual(self.get()['status'], 200, 'fallback cycle 2') + self.get(read_timeout=1) def test_fallback_invalid(self): def check_error(conf): |