beat into shape - python 2 compat and cleaner test abstractions

Author: albu-diku

mig/lib/coreapi/__init__.py

@@ -1,7 +1,15 @@
 import codecs
 import json
-from urllib.request import Request, urlopen
-from urllib.error import HTTPError
+
+from tests.support._env import PY2
+
+if PY2:
+    from urllib2 import HTTPError, Request, urlopen
+    from urllib import urlencode
+else:
+    from urllib.error import HTTPError
+    from urllib.parse import urlencode
+    from urllib.request import urlopen, Request
 
 from mig.lib.coresvc.payloads import PAYLOAD_POST_USER
 
@@ -78,7 +86,7 @@ def _issue_POST(self, request_path, request_data=None, request_json=None, respon
             data = response.read()
         except HTTPError as httpexc:
             status = httpexc.code
-            data = httpexc.file.read()
+            data = httpexc.fp.read()
 
         content = attempt_to_decode_response_data(data, response_encoding)
         return (status, content)

tests/support/serversupp.py

@@ -47,6 +47,10 @@ def __init__(self, ServerClass, *args, **kwargs):
         self._thread = None
         self._wrapped = None
 
+    def __getattr__(self, attr):
+        assert self._wrapped, "wrapped instance was not created"
+        return getattr(self._wrapped, attr)
+
     def run(self):
         """Mimic the same method from the standard thread API"""
         server_args, server_kwargs = self._arguments
@@ -76,14 +80,16 @@ def start_wait_until_ready(self):
     def stop(self):
         """Mimic the same method from the standard thread API"""
         self.stop_server()
-        self._wrapped = None
-        self._thread.join()
-        self._thread = None
+        if self._thread:
+            self._thread.join()
+            self._thread = None
 
     def stop_server(self):
         """Stop server thread"""
-        self._wrapped.shutdown()
-        self._wrapped.server_close()
+        if self._wrapped:
+            self._wrapped.shutdown()
+            self._wrapped.server_close()
+            self._wrapped = None
 
 
 def make_wrapped_server(ServerClass, *args, **kwargs):

tests/test_mig_lib_coreapi.py

@@ -8,29 +8,50 @@
 
 class TestRequestHandler(BaseHTTPRequestHandler):
     def do_POST(self):
-        self.send_response(418)
-        self.end_headers()
-        self.wfile.write(b'')
+        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)
 
 
 class TestHTTPServer(HTTPServer):
     def __init__(self, addr, **kwargs):
+        self._programmed_error = None
         self._on_start = kwargs.pop('on_start', lambda _: None)
 
         HTTPServer.__init__(self, addr, TestRequestHandler, **kwargs)
 
+    def clear_programmed(self):
+        self._programmed_error = None
+
+    def set_programmed_error(self, status, content):
+        assert isinstance(content, bytes)
+        self._programmed_error = (status, content)
+
     def server_activate(self):
         HTTPServer.server_activate(self)
         self._on_start(self)
 
 
-class TestBooleans(MigTestCase):
-    def test_true(self):
-        server_addr = ('localhost', 4567)
-        server = make_wrapped_server(TestHTTPServer, server_addr)
-        server.start_wait_until_ready()
+class TestMigLibCoreapi(MigTestCase):
+    def before_each(self):
+        self.server_addr = ('localhost', 4567)
+        self.server = make_wrapped_server(TestHTTPServer, self.server_addr)
+
+    def after_each(self):
+        server = getattr(self, 'server', None)
+        setattr(self, 'server', None)
+        if server:
+            server.stop()
 
-        instance = CoreApiClient("http://%s:%s/" % server_addr)
+    def test_true(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({
             'full_name': "Test User",