Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Commit 651b6d5

Browse files
authored
Merge pull request #39 from sjones4/s3-tag-status-code
Update s3 bucket tags test to check http status code for EUCA-12867. Thanks sjones
2 parents 99bc4eb + 42b9bbb commit 651b6d5

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

src/main/java/com/eucalyptus/tests/awssdk/S3BucketTests.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static com.eucalyptus.tests.awssdk.N4j.initS3ClientWithNewAccount;
66
import static com.eucalyptus.tests.awssdk.N4j.print;
77
import static com.eucalyptus.tests.awssdk.N4j.testInfo;
8+
import static org.testng.AssertJUnit.assertEquals;
89
import static org.testng.AssertJUnit.assertTrue;
910

1011
import java.util.ArrayList;
@@ -19,7 +20,11 @@
1920
import org.testng.annotations.Test;
2021

2122
import com.amazonaws.AmazonServiceException;
23+
import com.amazonaws.Request;
24+
import com.amazonaws.Response;
25+
import com.amazonaws.handlers.RequestHandler2;
2226
import com.amazonaws.services.s3.AmazonS3;
27+
import com.amazonaws.services.s3.AmazonS3Client;
2328
import com.amazonaws.services.s3.model.AccessControlList;
2429
import com.amazonaws.services.s3.model.AmazonS3Exception;
2530
import com.amazonaws.services.s3.model.Bucket;
@@ -350,7 +355,16 @@ public void testBucketTagging() throws Exception {
350355
List<TagSet> tagSetList = new ArrayList<TagSet>();
351356
tagSetList.add(tagSet1);
352357
bucketTaggingConfiguration.setTagSets(tagSetList);
358+
final RequestHandler2 statusCodeCheckingHandler = new RequestHandler2( ) {
359+
@Override
360+
public void afterResponse( final Request<?> request, final Response<?> response ) {
361+
print(account + ": Got response status code " + response.getHttpResponse( ).getStatusCode( ));
362+
assertEquals( "Status code", 204, response.getHttpResponse( ).getStatusCode( ) );
363+
}
364+
};
365+
((AmazonS3Client)s3).addRequestHandler( statusCodeCheckingHandler );
353366
s3.setBucketTaggingConfiguration(bucketName, bucketTaggingConfiguration);
367+
((AmazonS3Client)s3).removeRequestHandler( statusCodeCheckingHandler );
354368

355369
print(account + ": Getting TagSets for bucket '" + bucketName + "'");
356370
List<TagSet> tagSets = bucketTaggingConfiguration.getAllTagSets();

0 commit comments

Comments
 (0)