make it usable

Author: albu-diku

mig/lib/coreapi/__init__.py

@@ -1,5 +1,6 @@
 import codecs
 import json
+import werkzeug.exceptions as httpexceptions
 
 from tests.support._env import PY2
 
@@ -14,6 +15,10 @@
 from mig.lib.coresvc.payloads import PAYLOAD_POST_USER
 
 
+httpexceptions_by_code = {
+    exc.code: exc for exc in httpexceptions.__dict__.values() if hasattr(exc, 'code')}
+
+
 def attempt_to_decode_response_data(data, response_encoding=None):
     if data is None:
         return None
@@ -31,6 +36,10 @@ def attempt_to_decode_response_data(data, response_encoding=None):
             'issue_POST: unknown response_encoding "%s"' % (response_encoding,))
 
 
+def http_error_from_status_code(http_status_code, description=None):
+    return httpexceptions_by_code[http_status_code](description)
+
+
 class CoreApiClient:
     def __init__(self, base_url):
         self._base_url = base_url
@@ -94,4 +103,8 @@ def _issue_POST(self, request_path, request_data=None, request_json=None, respon
     def createUser(self, user_dict):
         payload = PAYLOAD_POST_USER.ensure(user_dict)
 
-        return self._issue_POST('/user', request_json=dict(payload))
+        status, output = self._issue_POST('/user', request_json=dict(payload))
+        if status != 201:
+            description = output if isinstance(output, str) else None
+            raise http_error_from_status_code(status, description)
+        return output

tests/test_mig_lib_coreapi.py

@@ -1,3 +1,5 @@
+import codecs
+import json
 from http.server import HTTPServer, BaseHTTPRequestHandler
 
 from tests.support import MigTestCase, testmain
@@ -10,17 +12,20 @@ class TestRequestHandler(BaseHTTPRequestHandler):
     def do_POST(self):
         test_server = self.server
 
-        programmed_error = test_server._programmed_error
-        if programmed_error:
-            status, content = programmed_error
-            self.send_response(status)
-            self.end_headers()
-            self.wfile.write(content)
+        if test_server._programmed_response:
+            status, content = test_server._programmed_response
+        elif test_server._programmed_error:
+            status, content = test_server._programmed_error
+
+        self.send_response(status)
+        self.end_headers()
+        self.wfile.write(content)
 
 
 class TestHTTPServer(HTTPServer):
     def __init__(self, addr, **kwargs):
         self._programmed_error = None
+        self._programmed_response = None
         self._on_start = kwargs.pop('on_start', lambda _: None)
 
         HTTPServer.__init__(self, addr, TestRequestHandler, **kwargs)
@@ -29,9 +34,18 @@ def clear_programmed(self):
         self._programmed_error = None
 
     def set_programmed_error(self, status, content):
+        assert self._programmed_response is None
         assert isinstance(content, bytes)
         self._programmed_error = (status, content)
 
+    def set_programmed_response(self, status, content):
+        assert self._programmed_error is None
+        assert isinstance(content, bytes)
+        self._programmed_response = (status, content)
+
+    def set_programmed_json_response(self, status, content):
+        self.set_programmed_response(status, codecs.encode(json.dumps(content), 'utf8'))
+
     def server_activate(self):
         HTTPServer.server_activate(self)
         self._on_start(self)
@@ -48,12 +62,32 @@ def after_each(self):
         if server:
             server.stop()
 
-    def test_true(self):
+    def test_raises_in_the_absence_of_success(self):
         self.server.start_wait_until_ready()
         self.server.set_programmed_error(418, b'tea; earl grey; hot')
         instance = CoreApiClient("http://%s:%s/" % self.server_addr)
 
-        status, content = instance.createUser({
+        with self.assertRaises(Exception):
+            instance.createUser({
+                'full_name': "Test User",
+                'organization': "Test Org",
+                'state': "NA",
+                'country': "DK",
+                'email': "[email protected]",
+                'comment': "This is the create comment",
+                'password': "password",
+            })
+
+    def test_returs_a_user_object(self):
+        test_content = {
+            'foo': 1,
+            'bar': True
+        }
+        self.server.start_wait_until_ready()
+        self.server.set_programmed_json_response(201, test_content)
+        instance = CoreApiClient("http://%s:%s/" % self.server_addr)
+
+        content = instance.createUser({
             'full_name': "Test User",
             'organization': "Test Org",
             'state': "NA",
@@ -63,8 +97,8 @@ def test_true(self):
             'password': "password",
         })
 
-        self.assertEqual(status, 418)
-
+        self.assertIsInstance(content, dict)
+        self.assertEqual(content, test_content)
 
 if __name__ == '__main__':
     testmain()