Remove tests if ~/.aws/credentials exists.

lsst · Aug 20, 2019 · e443ddc · e443ddc
1 parent 92534b7
commit e443ddc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/tests/test_butler.py b/tests/test_butler.py
@@ -620,11 +620,11 @@ def setUp(self):
         self.bucketName = uri.netloc
 
         # set up some fake credentials if they do not exist
-        if not os.path.exists("~/.aws/credentials"):
-            if "AWS_ACCESS_KEY_ID" not in os.environ:
-                os.environ["AWS_ACCESS_KEY_ID"] = "dummyAccessKeyId"
-            if "AWS_SECRET_ACCESS_KEY" not in os.environ:
-                os.environ["AWS_SECRET_ACCESS_KEY"] = "dummySecreyAccessKey"
+        self.usedDummyCredentials = False
+        if "AWS_ACCESS_KEY_ID" not in os.environ and "AWS_SECRET_ACCESS_KEY" not in os.environ:
+            os.environ["AWS_ACCESS_KEY_ID"] = "dummyAccessKeyId"
+            os.environ["AWS_SECRET_ACCESS_KEY"] = "dummySecreyAccessKey"
+            self.usedDummyCredentials = True
 
         if self.useTempRoot:
             self.root = self.genRoot()
@@ -657,9 +657,9 @@ def tearDown(self):
         bucket.delete()
 
         # unset any potentially set dummy credentials
-        keys = ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY"]
-        for key in keys:
-            if key in os.environ and "dummy" in os.environ[key]:
+        if self.usedDummyCredentials:
+            keys = ("AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY")
+            for key in keys:
                 del os.environ[key]
 
     def checkFileExists(self, root, relpath):

diff --git a/tests/test_butlerFits.py b/tests/test_butlerFits.py
@@ -198,11 +198,11 @@ def setUp(self):
         config.update({"datastore": {"datastore": {"root": rooturi}}})
 
         # set up some fake credentials if they do not exist
-        if not os.path.exists("~/.aws/credentials"):
-            if "AWS_ACCESS_KEY_ID" not in os.environ:
-                os.environ["AWS_ACCESS_KEY_ID"] = "dummyAccessKeyId"
-            if "AWS_SECRET_ACCESS_KEY" not in os.environ:
-                os.environ["AWS_SECRET_ACCESS_KEY"] = "dummySecreyAccessKey"
+        self.usedDummyCredentials = False
+        if "AWS_ACCESS_KEY_ID" not in os.environ and "AWS_SECRET_ACCESS_KEY" not in os.environ:
+            os.environ["AWS_ACCESS_KEY_ID"] = "dummyAccessKeyId"
+            os.environ["AWS_SECRET_ACCESS_KEY"] = "dummySecreyAccessKey"
+            self.usedDummyCredentials = True
 
         # MOTO needs to know that we expect Bucket bucketname to exist
         # (this used to be the class attribute bucketName)
@@ -231,9 +231,9 @@ def tearDown(self):
         bucket.delete()
 
         # unset any potentially set dummy credentials
-        keys = ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY"]
-        for key in keys:
-            if key in os.environ and "dummy" in os.environ[key]:
+        if self.usedDummyCredentials:
+            keys = ("AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY")
+            for key in keys:
                 del os.environ[key]
 
 

diff --git a/tests/test_s3utils.py b/tests/test_s3utils.py
@@ -48,11 +48,12 @@ class S3UtilsTestCase(unittest.TestCase):
 
     def setUp(self):
         # set up some fake credentials if they do not exist
-        if not os.path.exists("~/.aws/credentials"):
-            if "AWS_ACCESS_KEY_ID" not in os.environ:
-                os.environ["AWS_ACCESS_KEY_ID"] = "dummyAccessKeyId"
-            if "AWS_SECRET_ACCESS_KEY" not in os.environ:
-                os.environ["AWS_SECRET_ACCESS_KEY"] = "dummySecreyAccessKey"
+        # set up some fake credentials if they do not exist
+        self.usedDummyCredentials = False
+        if "AWS_ACCESS_KEY_ID" not in os.environ and "AWS_SECRET_ACCESS_KEY" not in os.environ:
+            os.environ["AWS_ACCESS_KEY_ID"] = "dummyAccessKeyId"
+            os.environ["AWS_SECRET_ACCESS_KEY"] = "dummySecreyAccessKey"
+            self.usedDummyCredentials = True
 
         s3 = boto3.client("s3")
         try:
@@ -79,9 +80,9 @@ def tearDown(self):
         bucket.delete()
 
         # unset any potentially set dummy credentials
-        keys = ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY"]
-        for key in keys:
-            if key in os.environ and "dummy" in os.environ[key]:
+        if self.usedDummyCredentials:
+            keys = ("AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY")
+            for key in keys:
                 del os.environ[key]
 
     def testBucketExists(self):