This is an automated email from the ASF dual-hosted git repository.
cwylie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 9c15f93 fix test issue where JettyTest would fail if
JettyWithResponseFilterEnabledTest ran before it (#11803)
9c15f93 is described below
commit 9c15f938fdaa1665f54629d661aaeaf88d3b8908
Author: TSFenwick <[email protected]>
AuthorDate: Mon Oct 18 12:42:41 2021 -0700
fix test issue where JettyTest would fail if
JettyWithResponseFilterEnabledTest ran before it (#11803)
this change ensures that JettyTest is setting the properties it needs in
case some other test overwrites them
this also changes up the ordering of the call for setProperties to call
super's first in case super is setting the same property
---
.../java/org/apache/druid/server/initialization/JettyTest.java | 8 ++++++++
.../server/initialization/JettyWithResponseFilterEnabledTest.java | 3 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git
a/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java
b/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java
index 59c84b9..ff8ae56 100644
--- a/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java
+++ b/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java
@@ -105,6 +105,14 @@ public class JettyTest extends BaseJettyTest
private LatchedRequestStateHolder latchedRequestState;
@Override
+ public void setProperties()
+ {
+ // call super.setProperties first in case it is setting the same property
as this class
+ super.setProperties();
+ System.setProperty("druid.server.http.showDetailedJettyErrors", "true");
+ }
+
+ @Override
protected Injector setupInjector()
{
TLSServerConfig tlsConfig;
diff --git
a/server/src/test/java/org/apache/druid/server/initialization/JettyWithResponseFilterEnabledTest.java
b/server/src/test/java/org/apache/druid/server/initialization/JettyWithResponseFilterEnabledTest.java
index b788e71..62e6189 100644
---
a/server/src/test/java/org/apache/druid/server/initialization/JettyWithResponseFilterEnabledTest.java
+++
b/server/src/test/java/org/apache/druid/server/initialization/JettyWithResponseFilterEnabledTest.java
@@ -27,8 +27,9 @@ public class JettyWithResponseFilterEnabledTest extends
JettyTest
@Override
public void setProperties()
{
- System.setProperty("druid.server.http.showDetailedJettyErrors", "false");
+ // call super.setProperties first in case it is setting the same property
as this class
super.setProperties();
+ System.setProperty("druid.server.http.showDetailedJettyErrors", "false");
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
