For #34500 : Updating base to be clearer about env vars, changing nosetests call so config will be correctly picked up, applying manne's feedback

Neil Grey · Neil Grey · commit 01ae5ce8e06c · 2016-01-27T13:09:34.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ install:
 before_script:
   - cp ./tests/example_config ./tests/config
 # command to run tests
-script: nosetests -w tests/
+script: nosetests -v
 notifications:
   email:
     - api@shotgunsoftware.com
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -409,7 +409,7 @@ def __init__(self,
         else:
             self.__ca_certs = os.environ.get('SHOTGUN_API_CACERTS')
 
-        self.base_url = (base_url or "")
+        self.base_url = (base_url or "").lower()
         self.config.scheme, self.config.server, api_base, _, _ = \
             urlparse.urlsplit(self.base_url)
         if self.config.scheme not in ("http", "https"):
@@ -422,7 +422,7 @@ def __init__(self,
         # if the service contains user information strip it out
         # copied from the xmlrpclib which turned the user:password into
         # and auth header
-        auth, self.config.server = urllib.splituser(self.config.server)
+        auth, self.config.server = urllib.splituser(urlparse.urlsplit(base_url).netloc)
         if auth:
             auth = base64.encodestring(urllib.unquote(auth))
             self.config.authorization = "Basic " + auth.strip()
diff --git a/tests/base.py b/tests/base.py
@@ -286,29 +286,34 @@ def setUp(self):
 class SgTestConfig(object):
     '''Reads test config and holds values'''
     def __init__(self):
-        self.mock           = True
-        self.server_url     = None
-        self.script_name    = None
-        self.api_key        = None
-        self.http_proxy     = None
-        self.session_uuid   = None
-        self.project_name   = None
-        self.human_name     = None
-        self.human_login    = None
-        self.human_password = None
-        self.asset_code     = None
-        self.version_code   = None
-        self.shot_code      = None
-        self.task_content   = None
+
+        for key in self.config_keys():
+            value = None
+            if key in ['mock']:
+                value = True
+            # Look for any environment variables that match our test
+            # configuration naming of "SG_{KEY}". Default is None.
+            value = os.environ.get('SG_{0}'.format(str(key).upper()))
+            setattr(self, key, value)
+
+    def config_keys(self):
+        return [
+            'api_key', 'asset_code', 'http_proxy', 'human_login', 'human_name',
+            'human_password', 'mock', 'project_name', 'script_name', 
+            'server_url', 'session_uuid', 'shot_code', 'task_content', 
+            'version_code'
+        ]
 
     def read_config(self, config_path):
         config_parser = ConfigParser()
         config_parser.read(config_path)
         for section in config_parser.sections():
             for option in config_parser.options(section):
-                value = (os.environ.get('SG_{0}'.format(str(option).upper())) or
-                        config_parser.get(section, option))
-                setattr(self, option, value)
+                # We only care about the configuration file if an environment
+                # variable has not already been set
+                if not getattr(self, option, None):
+                    value = config_parser.get(section, option)
+                    setattr(self, option, value)
 
 
 def _find_or_create_entity(sg, entity_type, data, identifyiers=None):
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -240,7 +240,7 @@ def test_rpc_error(self):
 
         try:
             self.sg.info()
-        except api.Fault as e:
+        except api.Fault, e:
             self.assertEqual("Go BANG", str(e))
 
     def test_call_rpc(self):
