diff options
| author | Andrey Zelenkov <zelenkov@nginx.com> | 2019-01-28 15:11:50 +0300 |
|---|---|---|
| committer | Andrey Zelenkov <zelenkov@nginx.com> | 2019-01-28 15:11:50 +0300 |
| commit | eced6bc97284478d67bfec04e204e4cd212167d9 (patch) | |
| tree | cf52c283fe3a137b6f143b9872d05cd158b1f1b6 | |
| parent | 9e383ecaf21138e51bceee89eb1cd1b342a980ad (diff) | |
| download | unit-eced6bc97284478d67bfec04e204e4cd212167d9.tar.gz unit-eced6bc97284478d67bfec04e204e4cd212167d9.tar.bz2 | |
Tests: removed blocking mode customization for sockets.
This customization was added in 0e12b17e512d and left unused.
Also, set blocking mode by default for all sockets.
| -rw-r--r-- | test/unit.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/unit.py b/test/unit.py index 2b95b792..55b3ce18 100644 --- a/test/unit.py +++ b/test/unit.py @@ -285,7 +285,6 @@ class TestUnitHTTP(TestUnit): port = 7080 if 'port' not in kwargs else kwargs['port'] url = '/' if 'url' not in kwargs else kwargs['url'] http = 'HTTP/1.0' if 'http_10' in kwargs else 'HTTP/1.1' - blocking = False if 'blocking' not in kwargs else kwargs['blocking'] headers = ({ 'Host': 'localhost', @@ -322,8 +321,6 @@ class TestUnitHTTP(TestUnit): sock.close() return None - sock.setblocking(blocking) - else: sock = kwargs['sock'] @@ -640,11 +637,11 @@ class TestUnitApplicationTLS(TestUnitApplicationProto): return self.conf(k.read() + c.read(), '/certificates/' + crt) def get_ssl(self, **kwargs): - return self.get(blocking=True, wrapper=self.context.wrap_socket, + return self.get(wrapper=self.context.wrap_socket, **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) def get_server_certificate(self, addr=('127.0.0.1', 7080)): |