base: Bugzilla: add configpaths __init__ property

crobinso · crobinso · commit 04429977a76e · 2019-01-09T14:46:02.000-05:00
To control configpath setting at startup. Needed for API symmetry
and for the test suite to skip API keys
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -235,7 +235,7 @@ def _listify(val):
 
     def __init__(self, url=-1, user=None, password=None, cookiefile=-1,
                  sslverify=True, tokenfile=-1, use_creds=True, api_key=None,
-                 cert=None):
+                 cert=None, configpaths=-1):
         """
         :param url: The bugzilla instance URL, which we will connect
             to immediately. Most users will want to specify this at
@@ -262,7 +262,8 @@ def __init__(self, url=-1, user=None, password=None, cookiefile=-1,
         :param sslverify: Maps to 'requests' sslverify parameter. Set to
             False to disable SSL verification, but it can also be a path
             to file or directory for custom certs.
-        :param api_key: A bugzilla
+        :param api_key: A bugzilla5+ API key
+        :param configpaths: A list of possible bugzillarc locations.
         """
         if url == -1:
             raise TypeError("Specify a valid bugzilla url, or pass url=None")
@@ -284,19 +285,22 @@ def __init__(self, url=-1, user=None, password=None, cookiefile=-1,
         self._field_aliases = []
         self._init_field_aliases()
 
-        self.configpath = _default_configpaths[:]
         if not use_creds:
             cookiefile = None
             tokenfile = None
-            self.configpath = []
+            configpaths = []
 
         if cookiefile == -1:
             cookiefile = _default_auth_location("bugzillacookies")
         if tokenfile == -1:
             tokenfile = _default_auth_location("bugzillatoken")
+        if configpaths == -1:
+            configpaths = _default_configpaths[:]
+
         log.debug("Using tokenfile=%s", tokenfile)
         self.cookiefile = cookiefile
         self.tokenfile = tokenfile
+        self.configpath = configpaths
 
         if url:
             self.connect(url)
diff --git a/tests/test_rw_functional.py b/tests/test_rw_functional.py
@@ -815,7 +815,7 @@ def compare(data, newid):
 
     def test12SetCookie(self):
         bz = self.bzclass(self.url,
-            cookiefile=-1, tokenfile=None)
+                cookiefile=-1, tokenfile=None, configpaths=[])
 
         try:
             bz.cookiefile = None
