Skip to content

Restore original settings on exception #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3dgiordano merged 1 commit into from
Jul 18, 2026
Merged

Restore original settings on exception #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/test/java/com/blazemeter/jmeter/http2/core/HTTP2JettyClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,11 +1003,13 @@ public void shouldNotGetSubResultWhenResourceIsCachedWithCode() throws Exception
sampler.setImageParser(true);
String message = "message";
String responseCode = "300";
String previousCacheMode = JMeterUtils.getProperty("cache_manager.cached_resource_mode");
JMeterUtils.setProperty("cache_manager.cached_resource_mode", "RETURN_CUSTOM_STATUS");
JMeterUtils.setProperty("RETURN_CUSTOM_STATUS.message", message);
JMeterUtils.setProperty("RETURN_CUSTOM_STATUS.code", responseCode);
JmeterCachedResourceModeSupport.refreshSnapshotFromProperties();
configureCacheManagerToSampler(true, false);
try {
HTTPSampleResult firstRequestExpected = buildResult(true, Code.OK,
hostHeader(), null, null, createURL(SERVER_PATH_200_EMBEDDED), HTTPConstants.GET);
firstRequestExpected.setResponseData(BASIC_HTML_TEMPLATE, StandardCharsets.UTF_8.name());
Expand All @@ -1020,6 +1022,9 @@ public void shouldNotGetSubResultWhenResourceIsCachedWithCode() throws Exception
firstRequestExpected.setSentBytes(0);
firstRequestExpected.setResponseData("", StandardCharsets.UTF_8.name());
validateEmbeddedResultCached(sampleWithGet(SERVER_PATH_200_EMBEDDED), firstRequestExpected);
} finally {
restoreCacheResourceMode(previousCacheMode);
}
}

/**
Expand All @@ -1035,10 +1040,12 @@ public void shouldNotGetSubResultWhenResourceIsCachedWithoutCode() throws Except
buildStartedServer();
sampler.setImageParser(true);
String message = "message";
String previousCacheMode = JMeterUtils.getProperty("cache_manager.cached_resource_mode");
JMeterUtils.setProperty("cache_manager.cached_resource_mode", "RETURN_200_CACHE");
JMeterUtils.setProperty("RETURN_200_CACHE.message", message);
JmeterCachedResourceModeSupport.refreshSnapshotFromProperties();
configureCacheManagerToSampler(true, false);
try {
// First request must connect to the server
HTTPSampleResult expected = buildResult(true, Code.OK,
hostHeader(), null, null, createURL(SERVER_PATH_200_EMBEDDED), HTTPConstants.GET);
Expand All @@ -1050,6 +1057,17 @@ public void shouldNotGetSubResultWhenResourceIsCachedWithoutCode() throws Except
expected.setResponseData("", StandardCharsets.UTF_8.name());
expected.setResponseMessage(message);
validateEmbeddedResultCached(sampleWithGet(SERVER_PATH_200_EMBEDDED), expected);
} finally {
restoreCacheResourceMode(previousCacheMode);
}
}

private void restoreCacheResourceMode(String previousCacheMode) {
if (previousCacheMode == null) {
JMeterUtils.getJMeterProperties().remove("cache_manager.cached_resource_mode");
} else {
JMeterUtils.setProperty("cache_manager.cached_resource_mode", previousCacheMode);
}
}

@Test
Expand Down
Loading