Add test for sequential /shell/run requests

This also fixes test bugs in the cases:
- Malformed json
- No json
more_events
Roberto Hueso Gómez 2020-01-17 13:47:35 +01:00 committed by Alvaro Neira Ayuso
parent 2c5e477dfb
commit 65a5c95cc2
1 changed files with 25 additions and 2 deletions

View File

@ -48,7 +48,7 @@ class TestShellRunMethods(unittest.TestCase):
def test_no_json(self): def test_no_json(self):
c = Client() c = Client()
s = Server() s = Server()
s.connect(probe=False) s.connect()
s.send('POST /shell/run HTTP/1.0\r\nContent-Length:0\r\n\r\n') s.send('POST /shell/run HTTP/1.0\r\nContent-Length:0\r\n\r\n')
response = s.recv() response = s.recv()
s.stop() s.stop()
@ -62,12 +62,35 @@ class TestShellRunMethods(unittest.TestCase):
'\r\nContent-Type:application/json\r\n\r\n' + json '\r\nContent-Type:application/json\r\n\r\n' + json
c = Client() c = Client()
s = Server() s = Server()
s.connect(probe=False) s.connect()
s.send(msg) s.send(msg)
response = s.recv() response = s.recv()
s.stop() s.stop()
c.stop() c.stop()
self.assertEqual(response, 'HTTP/1.0 400 Bad Request\r\n\r\n') self.assertEqual(response, 'HTTP/1.0 400 Bad Request\r\n\r\n')
def test_serial_requests(self):
req1_json = '{"run":"echo 1", "echo":true}'
req1 = 'POST /shell/run HTTP/1.0\r\nContent-Length:'+ \
str(len(req1_json)) + \
'\r\nContent-Type:application/json\r\n\r\n' + req1_json
req2_json = '{"run":"echo 2", "echo":true}'
req2 = 'POST /shell/run HTTP/1.0\r\nContent-Length:'+ \
str(len(req2_json)) + \
'\r\nContent-Type:application/json\r\n\r\n' + req2_json
response_json = '{"out": "2\n"}'
resp = 'HTTP/1.0 200 OK\r\nContent-Length:' + \
str(len(response_json)) + \
'\r\nContent-Type:application/json\r\n\r\n' + response_json
c = Client()
s = Server()
s.connect()
s.send(req1)
s.send(req2)
client_response = s.recv()
s.stop()
c.stop()
self.assertEqual(client_response, client_response)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()