#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.

9 files changed, 4 insertions, 156 deletions

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_0023_post_run_schedule.py b/tests/units/test_0020_post_run_schedule.py
index 3b92304..3b92304 100644
--- a/tests/units/test_0023_post_run_schedule.py
+++ b/tests/units/test_0020_post_run_schedule.py
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()