Bug 1405325 - Use HTTPWireProtocol#url to build full URL. r=maja_zf
authorAndreas Tolfsen <ato@sny.no>
Tue, 03 Oct 2017 16:21:25 +0100
changeset 432422 b817f99334fa42aa949d0c2da4a76bafb881dd4d
parent 432421 62b8da6295535e65dac66b18d7654cc4a014c261
child 432423 d06884758cb64b0226a0811fda273ff41f35ae51
push id7953
push userryanvm@gmail.com
push dateThu, 12 Oct 2017 14:05:58 +0000
treeherdermozilla-beta@f4ba99b41183 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaja_zf
bugs1405325
milestone57.0
Bug 1405325 - Use HTTPWireProtocol#url to build full URL. r=maja_zf Instead of using string concatentation for building the command URL, rely on self.url which internally uses urlparse.urljoin. MozReview-Commit-ID: DqakZJIgdJF
testing/web-platform/tests/tools/webdriver/webdriver/transport.py
--- a/testing/web-platform/tests/tools/webdriver/webdriver/transport.py
+++ b/testing/web-platform/tests/tools/webdriver/webdriver/transport.py
@@ -60,17 +60,17 @@ class HTTPWireProtocol(object):
         self.port = port
         self.url_prefix = url_prefix
 
         self._timeout = timeout
 
     def url(self, suffix):
         return urlparse.urljoin(self.url_prefix, suffix)
 
-    def send(self, method, url, body=None, headers=None):
+    def send(self, method, uri, body=None, headers=None):
         """Send a command to the remote.
 
         :param method: "POST" or "GET".
         :param url: "command part" of the requests URL path
         :param body: Body of the request.  Defaults to an empty dictionary
             if ``method`` is "POST".
         :param headers: Additional headers to include in the request.
         :return: an instance of wdclient.Response describing the HTTP response
@@ -84,17 +84,17 @@ class HTTPWireProtocol(object):
             body = json.dumps(body, cls=ToJsonEncoder)
 
         if isinstance(body, unicode):
             body = body.encode("utf-8")
 
         if headers is None:
             headers = {}
 
-        url = self.url_prefix + url
+        url = self.url(uri)
 
         kwargs = {}
         if self._timeout is not None:
             kwargs["timeout"] = self._timeout
 
         conn = httplib.HTTPConnection(
             self.host, self.port, strict=True, **kwargs)
         conn.request(method, url, body, headers)