Fix issues with the base path being dropped in CAS URLs

Author: Kevin D Smith

swat/tests/cas/test_basics.py

@@ -26,6 +26,7 @@
 import datetime
 import os
 import pandas
+import re
 import six
 import swat
 import swat.utils.testing as tm
@@ -108,7 +109,7 @@ def tearDown(self):
         swat.reset_option()
 
     def test_basic_connection(self):
-        self.assertEqual(self.s._hostname, HOST)
+        self.assertRegex(HOST, r'(\w+://)?%s(:|/|$)' % self.s._hostname)
         self.assertEqual(self.s._port, PORT)
         self.assertRegex(self.s._session, UUID_RE)
         if self.s._protocol == 'http':
@@ -122,7 +123,7 @@ def test_connection_failure(self):
         user, passwd = tm.get_user_pass()
         with captured_stderr() as out:
             with self.assertRaises(swat.SWATError):
-                swat.CAS(HOST, 1999, USER, PASSWD, protocol=PROTOCOL)
+                swat.CAS(re.sub(r':\d+(/|$)', r'\1', HOST), 1999, USER, PASSWD, protocol=PROTOCOL)
 
     def test_copy_connection(self):
         s2 = self.s.copy()
@@ -178,7 +179,7 @@ def test_connect_existing_session(self):
         user, passwd = tm.get_user_pass()
         t = swat.CAS(HOST, PORT, USER, PASSWD, protocol=PROTOCOL, session=self.s._session)
 
-        self.assertEqual(t._hostname, HOST)
+        self.assertRegex(HOST, r'(\w+://)?%s(:|/|$)' % t._hostname)
         self.assertEqual(t._port, PORT)
         self.assertEqual(t._session, self.s._session)
         if self.s._protocol == 'http':

swat/tests/cas/test_connection.py

@@ -160,16 +160,12 @@ def test_str(self):
         s = str(self.s)
 
         self.assertTrue(type(s) == str)
-        self.assertTrue(HOST in s)
-#       self.assertTrue(USERNAME in s)
-        self.assertTrue(str(PORT) in s)
+        self.assertRegex(s, r'''^CAS\(.+?, name='[^\']+', session='[^\']+'\)$''')
 
         r = repr(self.s)
 
         self.assertTrue(type(r) == str)
-        self.assertTrue(HOST in r)
-#       self.assertTrue(USERNAME in r)
-        self.assertTrue(str(PORT) in r)
+        self.assertRegex(r, r'''^CAS\(.+?, name='[^\']+', session='[^\']+'\)$''')
 
     def test_formatter(self):
         f = self.s.SASFormatter()

swat/utils/testing.py

@@ -31,6 +31,7 @@
 import warnings
 from six.moves.urllib.parse import urlparse
 from swat.config import OptionWarning
+from swat.cas.connection import CAS
 
 UUID_RE = r'^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$'
 
@@ -177,23 +178,21 @@ def get_host_port_proto():
     casport = None
     casprotocol = None
 
+    url = None
     for name in ['CAS_URL', 'CASURL', 'CAS_HOST', 'CASHOST', 'CAS_HOSTNAME', 'CASHOSTNAME']:
         if name in os.environ:
             url = os.environ[name]
-            if not re.match(r'^\w+://', url):
-                url = 'unknown://%s' % url
-            urlp = urlparse(url)
-            cashost = urlp.hostname
-            casport = urlp.port
-            casprotocol = urlp.scheme
-            if casprotocol == 'unknown':
-                casprotocol = None
+            break
 
     casport = casport or os.environ.get('CAS_PORT', os.environ.get('CASPORT'))
+    if casport:
+        casport = int(casport)
+
     casprotocol = casprotocol or os.environ.get('CAS_PROTOCOL', os.environ.get('CASPROTOCOL'))
 
-    if casport is not None:
-        casport = int(casport)
+    if url:
+        cashost, casport, username, password, casprotocol = \
+            CAS._get_connection_info(url, casport, casprotocol, None, None, None)
 
     if cashost and casport:
         return cashost, casport, casprotocol