Merge pull request #2230 from forslund/bugfix/message-bus-build-url

Bugfix/message bus build url

mycroft/messagebus/client/client.py

@@ -40,11 +40,19 @@ class MessageBusClient:
         self.connected_event = Event()
         self.started_running = False
 
+    @staticmethod
+    def build_url(host, port, route, ssl):
+        return '{scheme}://{host}:{port}{route}'.format(
+            scheme='wss' if ssl else 'ws',
+            host=host,
+            port=str(port),
+            route=route)
+
     def create_client(self):
-        url = '{scheme}://{host}:{port}{route}'.format(
-            scheme='wss' if self.config.ssl else 'ws',
+        url = MessageBusClient.build_url(
+            ssl=self.config.ssl,
             host=self.config.host,
-            port=str(self.config.port),
+            port=self.config.port,
             route=self.config.route
         )
         return WebSocketApp(

test/unittests/messagebus/client/test_client.py

@@ -0,0 +1,39 @@
+# Copyright 2019 Mycroft AI Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+from mock import patch
+
+from mycroft.messagebus.client import MessageBusClient
+
+WS_CONF = {
+    'websocket': {
+        "host": "testhost",
+        "port": 1337,
+        "route": "/core",
+        "ssl": False
+    }
+}
+
+
+class TestMessageBusClient:
+    def test_build_url(self):
+        url = MessageBusClient.build_url('localhost', 1337, '/core', False)
+        assert url == 'ws://localhost:1337/core'
+        ssl_url = MessageBusClient.build_url('sslhost', 443, '/core', True)
+        assert ssl_url == 'wss://sslhost:443/core'
+
+    @patch('mycroft.configuration.Configuration.get', return_value=WS_CONF)
+    def test_create_client(self, mock_conf):
+        mc = MessageBusClient()
+        assert mc.client.url == 'ws://testhost:1337/core'