Tests: read_timeout increased for incomplete requests.

Also fixed test without \"Host\" header.
This commit is contained in:
Andrey Zelenkov
2019-04-22 18:52:35 +03:00
parent 1c56579ebd
commit 5d15d8449d
2 changed files with 9 additions and 7 deletions

View File

@@ -1,6 +1,7 @@
import os import os
import re import re
import time import time
import unittest
from subprocess import call from subprocess import call
from unit.applications.lang.python import TestApplicationPython from unit.applications.lang.python import TestApplicationPython
@@ -179,7 +180,7 @@ Connection: close
self.assertEqual(self.post()['status'], 200, 'init') self.assertEqual(self.post()['status'], 200, 'init')
self.http(b"""GE""", raw=True, read_timeout=1) resp = self.http(b"""GE""", raw=True, read_timeout=5)
self.stop() self.stop()
@@ -192,7 +193,7 @@ Connection: close
self.assertEqual(self.post()['status'], 200, 'init') self.assertEqual(self.post()['status'], 200, 'init')
self.http(b"""GET /\n""", raw=True, read_timeout=1) self.http(b"""GET /\n""", raw=True)
self.stop() self.stop()
@@ -205,7 +206,7 @@ Connection: close
self.assertEqual(self.post()['status'], 200, 'init') self.assertEqual(self.post()['status'], 200, 'init')
self.http(b"""GET / HTTP/1.1""", raw=True, read_timeout=1) resp = self.http(b"""GET / HTTP/1.1""", raw=True, read_timeout=5)
self.stop() self.stop()
@@ -218,7 +219,7 @@ Connection: close
self.assertEqual(self.post()['status'], 200, 'init') self.assertEqual(self.post()['status'], 200, 'init')
resp = self.http(b"""GET / HTTP/1.1\n""", raw=True, read_timeout=1) resp = self.http(b"""GET / HTTP/1.1\n""", raw=True, read_timeout=5)
self.stop() self.stop()
@@ -227,17 +228,18 @@ Connection: close
'partial 4', 'partial 4',
) )
@unittest.expectedFailure
def test_access_log_partial_5(self): def test_access_log_partial_5(self):
self.load('empty') self.load('empty')
self.assertEqual(self.post()['status'], 200, 'init') self.assertEqual(self.post()['status'], 200, 'init')
self.http(b"""GET / HTTP/1.1\n\n""", raw=True, read_timeout=1) self.get(headers={'Connection': 'close'})
self.stop() self.stop()
self.assertIsNotNone( self.assertIsNotNone(
self.wait_for_record(r'"GET / HTTP/1.1" 200 0 "-" "-"'), self.wait_for_record(r'"GET / HTTP/1.1" 400 \d+ "-" "-"'),
'partial 5', 'partial 5',
) )

View File

@@ -294,7 +294,7 @@ class TestPythonApplication(TestApplicationPython):
""", """,
start=True, start=True,
raw=True, raw=True,
read_timeout=1, read_timeout=5,
) )
self.assertIn( self.assertIn(