Merge pull request #1497 from edx/jbau/fix-ora-uploads

test bucket existence before creation

common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py

@@ -39,7 +39,9 @@ def upload_to_s3(file_to_upload, keyname, s3_interface):
 
     conn = S3Connection(s3_interface['access_key'], s3_interface['secret_access_key'])
     bucketname = str(s3_interface['storage_bucket_name'])
-    bucket = conn.create_bucket(bucketname.lower())
+    bucket = conn.lookup(bucketname.lower())
+    if not bucket:
+        bucket = conn.create_bucket(bucketname.lower())
 
     k = Key(bucket)
     k.key = keyname

common/lib/xmodule/xmodule/tests/test_util_open_ended.py

@@ -52,6 +52,10 @@ class MockS3Connection(object):
     def create_bucket(self, bucket_name, **kwargs):
         return "edX Bucket"
 
+    def lookup(self, bucket_name):
+        return None
+
+
 class MockUploadedFile(object):
     """
     Create a mock uploaded file for image submission tests.