From 1d451acff5f6b088a1475e89dd4e8580eef7df47 Mon Sep 17 00:00:00 2001 From: Diego Crespo Quinta Date: Thu, 22 Oct 2020 14:34:37 +0200 Subject: #915 Fix several test errors Test 0006: add json to GET /session and update expected return code. Test 0012: add json to GET /software and update expected return code (200), in this case json fields are integer, not string. Test 0020: remove it, /image/create/incremental does not exist anymore. Test 0021: same as before for /image/restore/basic Test 0022: same as before for /image/restore/incremental Test 0023: rename to test_0020. --- tests/create_incremental_image.json | 1 - tests/restore_basic_image.json | 1 - tests/restore_incremental_image.json | 1 - tests/units/test_0006_post_session.py | 2 +- tests/units/test_0012_post_software.py | 4 +- .../test_0020_post_image_create_incremental.py | 49 -------------------- tests/units/test_0020_post_run_schedule.py | 28 ++++++++++++ tests/units/test_0021_post_image_restore_basic.py | 50 --------------------- .../test_0022_post_image_restore_incremental.py | 52 ---------------------- tests/units/test_0023_post_run_schedule.py | 28 ------------ 10 files changed, 32 insertions(+), 184 deletions(-) delete mode 100644 tests/create_incremental_image.json delete mode 100644 tests/restore_basic_image.json delete mode 100644 tests/restore_incremental_image.json delete mode 100644 tests/units/test_0020_post_image_create_incremental.py create mode 100644 tests/units/test_0020_post_run_schedule.py delete mode 100644 tests/units/test_0021_post_image_restore_basic.py delete mode 100644 tests/units/test_0022_post_image_restore_incremental.py delete mode 100644 tests/units/test_0023_post_run_schedule.py (limited to 'tests') diff --git a/tests/create_incremental_image.json b/tests/create_incremental_image.json deleted file mode 100644 index 94b3a4d..0000000 --- a/tests/create_incremental_image.json +++ /dev/null @@ -1 +0,0 @@ -{"clients":["192.168.56.11"], "disk":"1", "partition":"1", "id":"3", "name":"basica1", "repository":"192.168.56.10", "sync_params":{"sync":"1", "path":"", "diff":"0", "diff_id":"4", "diff_name":"p2", "remove":"1", "compress":"0", "cleanup":"0", "cache":"0", "cleanup_cache":"0", "remove_dst":"0"}} diff --git a/tests/restore_basic_image.json b/tests/restore_basic_image.json deleted file mode 100644 index 255507c..0000000 --- a/tests/restore_basic_image.json +++ /dev/null @@ -1 +0,0 @@ -{"clients":["192.168.56.11"],"disk":"1","partition":"1","id":"9","name":"test","repository":"192.168.56.10","profile":"17","type":"UNICAST","sync_params":{"path":"","method":"1","sync":"1","diff":"0","remove":"1","compress":"0","cleanup":"0","cache":"0","cleanup_cache":"0","remove_dst":"0"}} diff --git a/tests/restore_incremental_image.json b/tests/restore_incremental_image.json deleted file mode 100644 index 66dfd0a..0000000 --- a/tests/restore_incremental_image.json +++ /dev/null @@ -1 +0,0 @@ -{"clients":["192.168.56.11"],"disk":"1","partition":"1","id":"9","name":"test","repository":"192.168.56.10","profile":"17","type":"UNICAST","sync_params":{"diff_id":"1","diff_name":"test","path":"","method":"1","sync":"1","diff":"0","remove":"1","compress":"0","cleanup":"0","cache":"0","cleanup_cache":"0","remove_dst":"0"}} diff --git a/tests/units/test_0006_post_session.py b/tests/units/test_0006_post_session.py index ba6179f..6116a27 100644 --- a/tests/units/test_0006_post_session.py +++ b/tests/units/test_0006_post_session.py @@ -27,7 +27,7 @@ class TestPostSessionMethods(unittest.TestCase): self.assertEqual(returned.status_code, 400) def test_get(self): - returned = requests.get(self.url, headers=self.headers) + returned = requests.get(self.url, headers=self.headers, json={ 'client': ['192.168.56.11'] }) self.assertEqual(returned.status_code, 405) if __name__ == '__main__': diff --git a/tests/units/test_0012_post_software.py b/tests/units/test_0012_post_software.py index 3a00d46..47e63c3 100644 --- a/tests/units/test_0012_post_software.py +++ b/tests/units/test_0012_post_software.py @@ -28,7 +28,9 @@ class TestPostSoftwareMethods(unittest.TestCase): self.assertEqual(returned.status_code, 400) def test_get(self): - returned = requests.get(self.url, headers=self.headers) + returned = requests.get(self.url, headers=self.headers, json={ 'client' : ['192.168.56.11'], + 'disk' : 1, + 'partition' : 1 }) self.assertEqual(returned.status_code, 405) if __name__ == '__main__': diff --git a/tests/units/test_0020_post_image_create_incremental.py b/tests/units/test_0020_post_image_create_incremental.py deleted file mode 100644 index c677e27..0000000 --- a/tests/units/test_0020_post_image_create_incremental.py +++ /dev/null @@ -1,49 +0,0 @@ -import requests -import unittest - -class TestPostCreateIncrementalImageMethods(unittest.TestCase): - - def setUp(self): - self.url = 'http://localhost:8888/image/create/incremental' - self.headers = {'Authorization' : '07b3bfe728954619b58f0107ad73acc1'} - self.json = { 'clients' : [ '192.168.2.1', '192.168.2.2' ], - 'disk': '1', - 'partition': '1', - 'id': '3', - 'name': 'basica1', - 'repository': '192.168.56.10', - 'sync_params':{'sync': '1', - 'path': '', - 'diff': '0', - 'diff_id': '4', - 'diff_name': 'p2', - '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_0020_post_run_schedule.py b/tests/units/test_0020_post_run_schedule.py new file mode 100644 index 0000000..3b92304 --- /dev/null +++ b/tests/units/test_0020_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_0021_post_image_restore_basic.py b/tests/units/test_0021_post_image_restore_basic.py deleted file mode 100644 index efe8a61..0000000 --- a/tests/units/test_0021_post_image_restore_basic.py +++ /dev/null @@ -1,50 +0,0 @@ -import requests -import unittest - -class TestPostRestoreBasicImageMethods(unittest.TestCase): - - def setUp(self): - self.url = 'http://localhost:8888/image/restore/basic' - self.headers = {'Authorization' : '07b3bfe728954619b58f0107ad73acc1'} - self.json = { 'clients' : [ '192.168.2.1', '192.168.2.2' ], - 'disk': '1', - 'partition': '1', - 'id': '9', - 'name': 'test', - 'repository': '192.168.56.10', - 'profile': '17', - 'type': 'UNICAST', - 'sync_params':{'path': '', - 'method': '1', - '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_0022_post_image_restore_incremental.py b/tests/units/test_0022_post_image_restore_incremental.py deleted file mode 100644 index ad7727f..0000000 --- a/tests/units/test_0022_post_image_restore_incremental.py +++ /dev/null @@ -1,52 +0,0 @@ -import requests -import unittest - -class TestPostRestoreIncrementalImageMethods(unittest.TestCase): - - def setUp(self): - self.url = 'http://localhost:8888/image/restore/incremental' - self.headers = {'Authorization' : '07b3bfe728954619b58f0107ad73acc1'} - self.json = { 'clients' : [ '192.168.2.1', '192.168.2.2' ], - 'disk': '1', - 'partition': '1', - 'id': '9', - 'name': 'test', - 'repository': '192.168.56.10', - 'profile': '17', - 'type': 'UNICAST', - 'sync_params':{'diff_id': '1', - 'diff_name': 'test', - 'path': '', - 'method': '1', - '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_0023_post_run_schedule.py b/tests/units/test_0023_post_run_schedule.py deleted file mode 100644 index 3b92304..0000000 --- a/tests/units/test_0023_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