Merge lp:~pedronis/u1db/streamline-testing-servers-creation into lp:u1db

[Samuele Pedroni]

streamline testing servers creation, let them compute/provide directly what they consider their base_url

streamline testing servers creation, let them compute/provide directly what they consider their base_url

[Samuele Pedroni (pedronis)]

affects only tests

review: Approve

=== modified file 'u1db/tests/__init__.py'
--- u1db/tests/__init__.py	2012-09-25 20:04:08 +0000
+++ u1db/tests/__init__.py	2012-10-02 14:00:32 +0000
@@ -344,7 +344,8 @@
     @staticmethod
     def server_def():
         # hook point
-        # should return (ServerClass, "shutdown method name", "url_scheme")
+        # should return (make_server() -> (server, base_url),
+        #                "shutdown method name")
         class _RequestHandler(simple_server.WSGIRequestHandler):
             def log_request(*args):
                 pass  # suppress
@@ -352,13 +353,11 @@
         def make_server(host_port, application):
             assert application, "forgot to override make_app(_with_state)?"
             srv = simple_server.WSGIServer(host_port, _RequestHandler)
-            # patch the value in if it's None
-            if getattr(application, 'base_url', 1) is None:
-                application.base_url = "http://%s:%s" % srv.server_address
+            base_url = "http://%s:%s" % srv.server_address
             srv.set_app(application)
-            return srv
+            return srv, base_url
 
-        return make_server, "shutdown", "http"
+        return make_server, "shutdown"
 
     @staticmethod
     def make_app_with_state(state):
@@ -374,15 +373,15 @@
         super(TestCaseWithServer, self).setUp()
         self.server = self.server_thread = None
 
-    @property
-    def url_scheme(self):
-        return self.server_def()[-1]
-
     def startServer(self):
         server_def = self.server_def()
-        server_class, shutdown_meth, _ = server_def
+        server_maker, shutdown_meth = server_def
         application = self.make_app()
-        self.server = server_class(('127.0.0.1', 0), application)
+        self.server, self.base_url = server_maker(('127.0.0.1', 0),
+                                                  application)
+        # patch the value in if it's None
+        if getattr(application, 'base_url', 1) is None:
+            application.base_url = self.base_url
         self.server_thread = threading.Thread(target=self.server.serve_forever,
                                               kwargs=dict(poll_interval=0.01))
         self.server_thread.start()
@@ -390,10 +389,9 @@
         self.addCleanup(getattr(self.server, shutdown_meth))
 
     def getURL(self, path=None):
-        host, port = self.server.server_address
         if path is None:
             path = ''
-        return '%s://%s:%s/%s' % (self.url_scheme, host, port, path)
+        return '%s/%s' % (self.base_url, path)
 
 
 def socket_pair():
 
=== modified file 'u1db/tests/commandline/test_client.py'
--- u1db/tests/commandline/test_client.py	2012-09-24 09:36:54 +0000
+++ u1db/tests/commandline/test_client.py	2012-10-02 14:00:32 +0000
@@ -875,9 +875,10 @@
 
     def server_def(self):
         def make_server(host_port, _application):
-            return serve.make_server(host_port[0], host_port[1],
-                                     self.working_dir)
-        return make_server, "shutdown", "http"
+            srv = serve.make_server(host_port[0], host_port[1],
+                                    self.working_dir)
+            return srv, "http://%s:%d" % srv.server_address
+        return make_server, "shutdown"
 
     def setUp(self):
         super(TestHTTPIntegration, self).setUp()
 
=== modified file 'u1db/tests/test_http_client.py'
--- u1db/tests/test_http_client.py	2012-09-24 15:34:16 +0000
+++ u1db/tests/test_http_client.py	2012-10-02 14:00:32 +0000
@@ -143,9 +143,8 @@
         self.assertIs(None, cli._conn)
 
     def test_parse_url(self):
-        cli = http_client.HTTPClientBase(
-                                     '%s://127.0.0.1:12345/' % self.url_scheme)
-        self.assertEqual(self.url_scheme, cli._url.scheme)
+        cli = http_client.HTTPClientBase('http://127.0.0.1:12345/')
+        self.assertEqual('http', cli._url.scheme)
         self.assertEqual('127.0.0.1', cli._url.hostname)
         self.assertEqual(12345, cli._url.port)
         self.assertEqual('/', cli._url.path)
 
=== modified file 'u1db/tests/test_https.py'
--- u1db/tests/test_https.py	2012-09-24 09:36:54 +0000
+++ u1db/tests/test_https.py	2012-10-02 14:00:32 +0000
@@ -39,9 +39,8 @@
             srv.close_request(req)
 
         srv.shutdown_request = shutdown_request
-        application.base_url = "https://localhost:%s" % srv.server_address[1]
-        return srv
-    return make_server, "shutdown", "https"
+        return srv, "https://localhost:%s" % srv.server_address[1]
+    return make_server, "shutdown"
 
 
 def oauth_https_sync_target(test, host, path):
 
=== modified file 'u1db/tests/test_test_infrastructure.py'
--- u1db/tests/test_test_infrastructure.py	2012-09-24 09:36:54 +0000
+++ u1db/tests/test_test_infrastructure.py	2012-10-02 14:00:32 +0000
@@ -32,8 +32,9 @@
     def server_def():
         def make_server(host_port, application):
             assert application == "app"
-            return simple_server.WSGIServer(host_port, None)
-        return (make_server, "shutdown", "http")
+            srv =simple_server.WSGIServer(host_port, None)
+            return srv, "http://%s:%s" % srv.server_address
+        return (make_server, "shutdown")
 
     def test_getURL(self):
         self.startServer()