technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tests: removed blocking mode customization for sockets.

Browse Source 
This customization was added in 0e12b17e512d and left unused.
Also, set blocking mode by default for all sockets.
This commit is contained in:
Andrey Zelenkov
2019-01-28 15:11:50 +03:00
parent 9e383ecaf2
commit eced6bc972
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/unit.py
View File

@@ -285,7 +285,6 @@ class TestUnitHTTP(TestUnit):
port = 7080 if 'port' not in kwargs else kwargs['port'] port = 7080 if 'port' not in kwargs else kwargs['port']
url = '/' if 'url' not in kwargs else kwargs['url'] url = '/' if 'url' not in kwargs else kwargs['url']
http = 'HTTP/1.0' if 'http_10' in kwargs else 'HTTP/1.1' http = 'HTTP/1.0' if 'http_10' in kwargs else 'HTTP/1.1'
blocking = False if 'blocking' not in kwargs else kwargs['blocking']
headers = ({ headers = ({
'Host': 'localhost', 'Host': 'localhost',
@@ -322,8 +321,6 @@ class TestUnitHTTP(TestUnit):
sock.close() sock.close()
return None return None
sock.setblocking(blocking)
else: else:
sock = kwargs['sock'] sock = kwargs['sock']
@@ -640,11 +637,11 @@ class TestUnitApplicationTLS(TestUnitApplicationProto):
return self.conf(k.read() + c.read(), '/certificates/' + crt) return self.conf(k.read() + c.read(), '/certificates/' + crt)
def get_ssl(self, **kwargs): def get_ssl(self, **kwargs):
return self.get(blocking=True, wrapper=self.context.wrap_socket, return self.get(wrapper=self.context.wrap_socket,
**kwargs) **kwargs)
def post_ssl(self, **kwargs): def post_ssl(self, **kwargs):
return self.post(blocking=True, wrapper=self.context.wrap_socket, return self.post(wrapper=self.context.wrap_socket,
**kwargs) **kwargs)
def get_server_certificate(self, addr=('127.0.0.1', 7080)): def get_server_certificate(self, addr=('127.0.0.1', 7080)):