fix behavior when url has no protocol

remove warnings

fix behavior when url has no protocol

Author: jacalata

tableauserverclient/server/server.py

@@ -1,5 +1,4 @@
 import logging
-import warnings
 
 import requests
 import urllib3
@@ -63,10 +62,6 @@ def __init__(self, server_address, use_server_version=False, http_options=None,
         self._site_id = None
         self._user_id = None
 
-        # TODO: this needs to change to default to https, but without breaking existing code
-        if not server_address.startswith("http://") and not server_address.startswith("https://"):
-            server_address = "http://" + server_address
-
         self._server_address: str = server_address
         self._session_factory = session_factory or requests.session
 
@@ -96,6 +91,8 @@ def __init__(self, server_address, use_server_version=False, http_options=None,
         self.flow_runs = FlowRuns(self)
         self.metrics = Metrics(self)
 
+        self.logger = logging.getLogger("TSC.server")
+
         self._session = self._session_factory()
         self._http_options = dict()  # must set this before making a server call
         if http_options:
@@ -110,6 +107,9 @@ def __init__(self, server_address, use_server_version=False, http_options=None,
     def validate_connection_settings(self):
         try:
             Endpoint(self).set_parameters(self._http_options, None, None, None, None)
+            if not server_address.startswith("http://") and not server_address.startswith("https://"):
+                self._server_address = "http://" + self._server_address
+            self._session.prepare_request(requests.Request("GET", url=self._server_address, params=self._http_options))
         except Exception as req_ex:
             raise ValueError("Server connection settings not valid", req_ex)
 
@@ -149,8 +149,8 @@ def _get_legacy_version(self):
         try:
             info_xml = fromstring(response.content)
         except ParseError as parseError:
-            logging.getLogger("TSC.server").info(parseError)
-            logging.getLogger("TSC.server").info(
+            logger.info(parseError)
+            logger.info(
                 "Could not read server version info. The server may not be running or configured."
             )
             return self.version
@@ -165,7 +165,8 @@ def _determine_highest_version(self):
             version = self.server_info.get().rest_api_version
         except ServerInfoEndpointNotFoundError:
             version = self._get_legacy_version()
-        except BaseException:
+        except BaseException as e:
+            logger.info("Could not get version info from server, guessing {}".format(e.__class__))
             version = self._get_legacy_version()
 
         self.version = old_version
@@ -177,7 +178,7 @@ def use_server_version(self):
 
     def use_highest_version(self):
         self.use_server_version()
-        warnings.warn("use use_server_version instead", DeprecationWarning)
+        logger.info("use use_server_version instead", DeprecationWarning)
 
     def check_at_least_version(self, target: str):
         server_version = Version(self.version or "0.0")

test/http/test_http_requests.py

@@ -43,9 +43,9 @@ def test_init_server_model_valid_https_server_name_works(self):
     def test_init_server_model_bad_server_name_not_version_check(self):
         server = TSC.Server("fake-url", use_server_version=False)
 
-    def test_init_server_model_bad_server_name_do_version_check(self):
-        with self.assertRaises(requests.exceptions.ConnectionError):
-            server = TSC.Server("fake-url", use_server_version=True)
+    @mock.patch("requests.sessions.Session.get", side_effect=mocked_requests_get)
+    def test_init_server_model_bad_server_name_do_version_check(self, mock_get):
+        server = TSC.Server("fake-url", use_server_version=True)
 
     def test_init_server_model_bad_server_name_not_version_check_random_options(self):
         # with self.assertRaises(MissingSchema):