Tests: http() function introduced.

This commit is contained in:
Andrey Zelenkov
2017-12-13 15:23:32 +03:00
parent f7c386ece3
commit d2bf066b1c

View File

@@ -110,39 +110,32 @@ class TestUnitControl(TestUnit):
# TODO socket reuse # TODO socket reuse
# TODO http client # TODO http client
def get(self, path='/'): def http(self, req):
with self._control_sock() as sock: with self._control_sock() as sock:
req = ('GET ' + path
+ ' HTTP/1.1\r\nHost: localhost\r\n\r\n').encode()
sock.sendall(req) sock.sendall(req)
if '--verbose' in sys.argv: if '--verbose' in sys.argv:
print('>>>\n', req) print('>>>', req, sep='\n')
resp = self._recvall(sock) resp = self._recvall(sock)
if '--verbose' in sys.argv: if '--verbose' in sys.argv:
print('<<<\n', resp) print('<<<', resp, sep='\n')
return resp
def get(self, path='/'):
resp = self.http(('GET ' + path
+ ' HTTP/1.1\r\nHost: localhost\r\n\r\n').encode())
return self._body_json(resp) return self._body_json(resp)
def delete(self, path='/'): def delete(self, path='/'):
with self._control_sock() as sock: resp = self.http(('DELETE ' + path
req = ('DELETE ' + path + ' HTTP/1.1\r\nHost: localhost\r\n\r\n').encode())
+ ' HTTP/1.1\r\nHost: localhost\r\n\r\n').encode()
sock.sendall(req)
if '--verbose' in sys.argv:
print('>>>\n', req)
resp = self._recvall(sock)
if '--verbose' in sys.argv:
print('<<<\n', resp)
return self._body_json(resp) return self._body_json(resp)
@@ -151,20 +144,9 @@ class TestUnitControl(TestUnit):
if isinstance(data, str): if isinstance(data, str):
data = data.encode() data = data.encode()
with self._control_sock() as sock: resp = self.http(('PUT ' + path + ' HTTP/1.1\nHost: localhost\n'
req = ('PUT ' + path + ' HTTP/1.1\nHost: localhost\n'
+ 'Content-Length: ' + str(len(data)) + 'Content-Length: ' + str(len(data))
+ '\r\n\r\n').encode() + data + '\r\n\r\n').encode() + data)
sock.sendall(req)
if '--verbose' in sys.argv:
print('>>>\n', req)
resp = self._recvall(sock)
if '--verbose' in sys.argv:
print('<<<\n', resp)
return self._body_json(resp) return self._body_json(resp)