Apply feedback

Author: tlrx

plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/MockAmazonS3.java

@@ -87,7 +87,6 @@ public boolean doesObjectExist(final String bucketName, final String objectName)
 
     @Override
     public PutObjectResult putObject(final PutObjectRequest request) throws AmazonClientException {
-        assertThat(request.getBucketName(), equalTo(bucket));
         assertThat(request.getBucketName(), equalTo(bucket));
         assertThat(request.getMetadata().getSSEAlgorithm(), serverSideEncryption ? equalTo("AES256") : nullValue());
         assertThat(request.getCannedAcl(), notNullValue());
@@ -185,7 +184,7 @@ public DeleteObjectsResult deleteObjects(DeleteObjectsRequest request) throws Sd
 
         final List<DeleteObjectsResult.DeletedObject> deletions = new ArrayList<>();
         for (DeleteObjectsRequest.KeyVersion key : request.getKeys()) {
-            if(blobs.remove(key.getKey()) == null){
+            if (blobs.remove(key.getKey()) == null) {
                 AmazonS3Exception exception = new AmazonS3Exception("[" + key + "] does not exist.");
                 exception.setStatusCode(404);
                 throw exception;

plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java

@@ -29,6 +29,7 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.repositories.Repository;
 import org.elasticsearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
 import java.util.Collection;
@@ -65,6 +66,11 @@ public static void setUpRepositorySettings() {
         }
     }
 
+    @AfterClass
+    public static void wipeRepository() {
+        blobs.clear();
+    }
+
     @Override
     protected void createTestRepository(final String name) {
         assertAcked(client().admin().cluster().preparePutRepository(name)