Skip to content

Commit 06f92db

Browse files
committed
adding back commented test
1 parent a462086 commit 06f92db

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsTest.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ public void getAmiId_queriesAndIncludesToken() {
7979
WireMock.verify(getRequestedFor(urlPathEqualTo(AMI_ID_RESOURCE)).withHeader(TOKEN_HEADER, equalTo(TOKEN_STUB)));
8080
}
8181

82-
// @Test
83-
// public void getAmiId_tokenQueryTimeout_fallsBackToInsecure() {
84-
// stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withFixedDelay(Integer.MAX_VALUE)));
85-
// stubFor(get(urlPathEqualTo(AMI_ID_RESOURCE)).willReturn(aResponse().withBody("{}")));
86-
//
87-
// EC2MetadataUtils.getAmiId();
88-
//
89-
// WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(EC2_METADATA_TOKEN_TTL_HEADER, equalTo("21600")));
90-
// WireMock.verify(getRequestedFor(urlPathEqualTo(AMI_ID_RESOURCE)).withoutHeader(TOKEN_HEADER));
91-
// }
82+
@Test
83+
public void getAmiId_tokenQueryTimeout_fallsBackToInsecure() {
84+
stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withFixedDelay(Integer.MAX_VALUE)));
85+
stubFor(get(urlPathEqualTo(AMI_ID_RESOURCE)).willReturn(aResponse().withBody("{}")));
86+
87+
EC2MetadataUtils.getAmiId();
88+
89+
WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(EC2_METADATA_TOKEN_TTL_HEADER, equalTo("21600")));
90+
WireMock.verify(getRequestedFor(urlPathEqualTo(AMI_ID_RESOURCE)).withoutHeader(TOKEN_HEADER));
91+
}
9292

9393
@Test
9494
public void getAmiId_queriesTokenResource_403Error_fallbackToInsecure() {
@@ -163,16 +163,16 @@ public void getAmiId_queriesTokenResource_400Error_throws() {
163163
EC2MetadataUtils.getAmiId();
164164
}
165165

166-
// @Test
167-
// public void fetchDataWithAttemptNumber_ioError_shouldHonor() {
168-
// int attempts = 1;
169-
// thrown.expect(SdkClientException.class);
170-
// thrown.expectMessage("Unable to contact EC2 metadata service");
171-
//
172-
// stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withBody(TOKEN_STUB)));
173-
// stubFor(get(urlPathEqualTo(AMI_ID_RESOURCE)).willReturn(aResponse().withFault(Fault.CONNECTION_RESET_BY_PEER)));
174-
//
175-
// EC2MetadataUtils.fetchData(AMI_ID_RESOURCE, false, attempts);
176-
// WireMock.verify(attempts, getRequestedFor(urlPathEqualTo(AMI_ID_RESOURCE)));
177-
// }
166+
@Test
167+
public void fetchDataWithAttemptNumber_ioError_shouldHonor() {
168+
int attempts = 1;
169+
thrown.expect(SdkClientException.class);
170+
thrown.expectMessage("Unable to contact EC2 metadata service");
171+
172+
stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withBody(TOKEN_STUB)));
173+
stubFor(get(urlPathEqualTo(AMI_ID_RESOURCE)).willReturn(aResponse().withFault(Fault.CONNECTION_RESET_BY_PEER)));
174+
175+
EC2MetadataUtils.fetchData(AMI_ID_RESOURCE, false, attempts);
176+
WireMock.verify(attempts, getRequestedFor(urlPathEqualTo(AMI_ID_RESOURCE)));
177+
}
178178
}

0 commit comments

Comments
 (0)