Fix issue with using localhost for TestingBot tunnel

Fixes: #216

Author: BeyondEvil

pytest_selenium/drivers/testingbot.py

@@ -3,10 +3,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import pytest
-
-from py.xml import html
 import requests
 
+from hashlib import md5
+from py.xml import html
 from pytest_selenium.drivers.cloud import Provider
 
 HOST = "hub.testingbot.com"
@@ -29,7 +29,9 @@ def auth(self):
 
     @property
     def executor(self):
-        return "https://{0.host}:{0.port}/wd/hub".format(self)
+        return "{1}://{0.host}:{0.port}/wd/hub".format(
+            self, "http" if self.host == "localhost" else "https"
+        )
 
     @property
     def key(self):
@@ -118,8 +120,6 @@ def _video_html(video_url, session):
 
 
 def get_auth_url(url, provider, session_id):
-    from hashlib import md5
-
     key = "{0.key}:{0.secret}:{1}".format(provider, session_id)
     token = md5(key.encode("utf-8")).hexdigest()
     return "{}?auth={}".format(url, token)

testing/test_edge.py

@@ -3,10 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import pytest
+import sys
 
 pytestmark = pytest.mark.nondestructive
 
 
+@pytest.mark.skipif(sys.platform != "win32", reason="Edge only runs on Windows")
 @pytest.mark.edge
 def test_launch(testdir, httpserver):
     httpserver.serve_content(content="<h1>Success!</h1>")

testing/test_testingbot.py

@@ -2,11 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from functools import partial
 import os
-
 import pytest
 
+from functools import partial
+from pytest_selenium.drivers.testingbot import TestingBot, HOST, PORT
+
 pytestmark = [pytest.mark.skip_selenium, pytest.mark.nondestructive]
 
 
@@ -88,3 +89,11 @@ def test_invalid_host(failure, monkeypatch, tmpdir):
         "Name or service not known",
     ]
     assert any(message in out for message in messages)
+
+
+@pytest.mark.parametrize(
+    ("protocol", "host", "port"), [("http", "localhost", "4445"), ("https", HOST, PORT)]
+)
+def test_executor_url(protocol, host, port):
+    tb = TestingBot(host, port)
+    assert tb.executor == "{}://{}:{}/wd/hub".format(protocol, host, port)