48k.eu-mirror
/
ogserver
mirror of https://git.48k.eu/ogserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#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.
master
Diego Crespo Quinta 2020-10-22 14:34:37 +02:00 committed by OpenGnSys Support Team
parent 7f5ab4ac35
commit 1d451acff5
9 changed files with 4 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/create_incremental_image.json
View File

@ -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"}}

1
tests/restore_basic_image.json
View File

@ -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"}}

1
tests/restore_incremental_image.json
View File

@ -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"}}

2
tests/units/test_0006_post_session.py
View File

@ -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__':

4
tests/units/test_0012_post_software.py
View File

@ -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__':

49
tests/units/test_0020_post_image_create_incremental.py
View File

@ -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()

0
tests/units/test_0023_post_run_schedule.py → tests/units/test_0020_post_run_schedule.py
View File

50
tests/units/test_0021_post_image_restore_basic.py
View File

@ -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()

52
tests/units/test_0022_post_image_restore_incremental.py
View File

@ -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()