diff options
| author | Robert Gemmell <robbie@apache.org> | 2009-11-26 16:47:53 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2009-11-26 16:47:53 +0000 |
| commit | 5c0084fd2948a73c87f9bc3e8b399216c8d09148 (patch) | |
| tree | 59d5ccdfdfdf45cf9e54a3276ca76ad90abe69e1 | |
| parent | b4a21d1957bb44cb4a289a8ed8dfc7b45cd8464d (diff) | |
| download | qpid-python-5c0084fd2948a73c87f9bc3e8b399216c8d09148.tar.gz | |
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@884635 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java | 2 | ||||
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java index b0415b67c0..cbdb310179 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java +++ b/qpid/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/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index 886612b9d9..7f43a3ee68 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/qpid/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 + } + } } } |