Add Note section to setAwsEnvCredentials. Fix missing credentials che…

…ck in test_butler.
lsst · Aug 20, 2019 · aa54f1b · aa54f1b
1 parent 1d0939d
commit aa54f1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/python/lsst/daf/butler/core/s3utils.py b/python/lsst/daf/butler/core/s3utils.py
@@ -148,6 +148,11 @@ def setAwsEnvCredentials(accessKeyId='dummyAccessKeyId', secretAccessKey="dummyS
     -------
     setEnvCredentials : `bool`
         True when environmental variables were set, False otherwise.
+
+    Note
+    ----
+    If either AWS_ACCESS_KEY_ID or AWS_SECRET_ACCESS_KEY are not set, both
+    values are overwritten. 
     """
     if "AWS_ACCESS_KEY_ID" not in os.environ or "AWS_SECRET_ACCESS_KEY" not in os.environ:
         os.environ["AWS_ACCESS_KEY_ID"] = accessKeyId

diff --git a/tests/test_butler.py b/tests/test_butler.py
@@ -655,7 +655,8 @@ def tearDown(self):
         bucket.delete()
 
         # unset any potentially set dummy credentials
-        unsetAwsEnvCredentials()
+        if self.usingDummyCredentials:
+            unsetAwsEnvCredentials()
 
     def checkFileExists(self, root, relpath):
         """Checks if file exists at a given path (relative to root).