From b11608152e9e2a9af32e15a100d3d034222ad3e4 Mon Sep 17 00:00:00 2001 From: Isabel Arrans Date: Fri, 23 Oct 2020 18:55:17 +0200 Subject: #915 restore more tests --- tests/units/test_0003_post_wol.py | 2 +- tests/units/test_0011_post_hardware.py | 4 +- tests/units/test_0014_big_request.py | 2 +- tests/units/test_0019_post_image_create_basic.py | 47 ------------------------ tests/units/test_0019_post_run_schedule.py | 28 ++++++++++++++ tests/units/test_0020_post_run_schedule.py | 28 -------------- 6 files changed, 32 insertions(+), 79 deletions(-) delete mode 100644 tests/units/test_0019_post_image_create_basic.py create mode 100644 tests/units/test_0019_post_run_schedule.py delete mode 100644 tests/units/test_0020_post_run_schedule.py diff --git a/tests/units/test_0003_post_wol.py b/tests/units/test_0003_post_wol.py index 5c8c012..a9a2d42 100644 --- a/tests/units/test_0003_post_wol.py +++ b/tests/units/test_0003_post_wol.py @@ -6,7 +6,7 @@ class TestPostWolMethods(unittest.TestCase): def setUp(self): self.url = 'http://localhost:8888/wol' self.headers = {'Authorization' : '07b3bfe728954619b58f0107ad73acc1'} - self.json = { 'type' : 'broadcast', 'clients' : [ { 'addr' : '192.168.2.1', + self.json = { 'type' : 'broadcast', 'clients' : [ { 'addr' : '192.168.2.1', 'netmask':'255.255.255.0', 'mac' : '00AABBCCDD01' } ] } def test_post(self): diff --git a/tests/units/test_0011_post_hardware.py b/tests/units/test_0011_post_hardware.py index 1f3e160..105c029 100644 --- a/tests/units/test_0011_post_hardware.py +++ b/tests/units/test_0011_post_hardware.py @@ -21,8 +21,8 @@ class TestPostHardwareMethods(unittest.TestCase): self.assertEqual(returned.status_code, 400) def test_get(self): - returned = requests.get(self.url, headers=self.headers) - self.assertEqual(returned.status_code, 405) + returned = requests.get(self.url, headers=self.headers, json={ "scope": { "id": 6, "type": "computer" }}) + self.assertEqual(returned.status_code, 200) if __name__ == '__main__': unittest.main() diff --git a/tests/units/test_0014_big_request.py b/tests/units/test_0014_big_request.py index 5e5e2d7..48f0cb2 100644 --- a/tests/units/test_0014_big_request.py +++ b/tests/units/test_0014_big_request.py @@ -1,7 +1,7 @@ import requests import unittest -MAX_REQ_SIZE = 4096 +MAX_REQ_SIZE = 65536 class TestBigRequest(unittest.TestCase): diff --git a/tests/units/test_0019_post_image_create_basic.py b/tests/units/test_0019_post_image_create_basic.py deleted file mode 100644 index 9d05b99..0000000 --- a/tests/units/test_0019_post_image_create_basic.py +++ /dev/null @@ -1,47 +0,0 @@ -import requests -import unittest - -class TestPostCreateBasicImageMethods(unittest.TestCase): - - def setUp(self): - self.url = 'http://localhost:8888/image/create/basic' - self.headers = {'Authorization' : '07b3bfe728954619b58f0107ad73acc1'} - self.json = { 'clients' : [ '192.168.2.1', '192.168.2.2' ], - 'disk': '1', - 'partition': '1', - 'code': '131', - 'id': '8', - 'name': 'debianbasica', - 'repository': '192.168.56.10', - 'sync_params':{'sync': '1', - 'diff': '0', - 'remove': '1', - 'compress': '0', - 'cleanup': '0', - 'cache': '0', - 'cleanup_cache': '0', - 'remove_dst': '0'} } - - def test_post(self): - returned = requests.post(self.url, headers=self.headers, json=self.json) - self.assertEqual(returned.status_code, 200) - - def test_no_payload(self): - returned = requests.post(self.url, headers=self.headers, json=None) - self.assertEqual(returned.status_code, 400) - - def test_malformed_payload(self): - for parameter in self.json: - malformed_payload = self.json.copy() - malformed_payload.pop(parameter) - returned = requests.post(self.url, - headers=self.headers, - json=malformed_payload) - self.assertEqual(returned.status_code, 400) - - def test_get(self): - returned = requests.get(self.url, headers=self.headers) - self.assertEqual(returned.status_code, 405) - -if __name__ == '__main__': - unittest.main() diff --git a/tests/units/test_0019_post_run_schedule.py b/tests/units/test_0019_post_run_schedule.py new file mode 100644 index 0000000..3b92304 --- /dev/null +++ b/tests/units/test_0019_post_run_schedule.py @@ -0,0 +1,28 @@ +import requests +import unittest + +class TestPostRunScheduleMethods(unittest.TestCase): + + def setUp(self): + self.url = 'http://localhost:8888/run/schedule' + self.headers = {'Authorization' : '07b3bfe728954619b58f0107ad73acc1'} + self.json = { 'clients' : [ '192.168.2.1', '192.168.2.2' ] } + + def test_post(self): + returned = requests.post(self.url, headers=self.headers, json=self.json) + self.assertEqual(returned.status_code, 200) + + def test_no_payload(self): + returned = requests.post(self.url, headers=self.headers, json=None) + self.assertEqual(returned.status_code, 400) + + def test_malformed_payload(self): + returned = requests.post(self.url, headers=self.headers, json={}) + self.assertEqual(returned.status_code, 400) + + def test_get(self): + returned = requests.get(self.url, headers=self.headers) + self.assertEqual(returned.status_code, 405) + +if __name__ == '__main__': + unittest.main() diff --git a/tests/units/test_0020_post_run_schedule.py b/tests/units/test_0020_post_run_schedule.py deleted file mode 100644 index 3b92304..0000000 --- a/tests/units/test_0020_post_run_schedule.py +++ /dev/null @@ -1,28 +0,0 @@ -import requests -import unittest - -class TestPostRunScheduleMethods(unittest.TestCase): - - def setUp(self): - self.url = 'http://localhost:8888/run/schedule' - self.headers = {'Authorization' : '07b3bfe728954619b58f0107ad73acc1'} - self.json = { 'clients' : [ '192.168.2.1', '192.168.2.2' ] } - - def test_post(self): - returned = requests.post(self.url, headers=self.headers, json=self.json) - self.assertEqual(returned.status_code, 200) - - def test_no_payload(self): - returned = requests.post(self.url, headers=self.headers, json=None) - self.assertEqual(returned.status_code, 400) - - def test_malformed_payload(self): - returned = requests.post(self.url, headers=self.headers, json={}) - self.assertEqual(returned.status_code, 400) - - def test_get(self): - returned = requests.get(self.url, headers=self.headers) - self.assertEqual(returned.status_code, 405) - -if __name__ == '__main__': - unittest.main() -- cgit v1.2.3-18-g5258