From a807007446cbc14e31a4f16f09d8a155da4493ea Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Thu, 26 Nov 2009 16:47:53 +0000 Subject: QPID-2184: correct use of reload instead of restart in testDenyOnRestartInVhost(), add a delay to the SIGHUP based reload to help ensure the new config is in place before testing continues, helping prevent sporadic failure git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@884635 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/security/firewall/FirewallConfigTest.java | 2 +- .../main/java/org/apache/qpid/test/utils/QpidTestCase.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'java') diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java b/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java index b0415b67c0..cbdb310179 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java @@ -158,7 +158,7 @@ public class FirewallConfigTest extends QpidTestCase { try { - reloadBroker(); + restartBroker(); } catch (Exception e) { fail(e.getMessage()); diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index 886612b9d9..7f43a3ee68 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -1263,6 +1263,17 @@ public class QpidTestCase extends TestCase BufferedReader reader = new BufferedReader (new InputStreamReader(p.getInputStream())); String cmd = "/bin/kill -SIGHUP " + reader.readLine(); p = Runtime.getRuntime().exec(cmd); + + //delay to ensure the reload time has time to occur + try + { + Thread.sleep(1000); + } + catch (InterruptedException e) + { + //ignore + } + } } } -- cgit v1.2.1