Author: robbie
Date: Thu Nov 26 16:47:53 2009
New Revision: 884635
URL: http://svn.apache.org/viewvc?rev=884635&view=rev
Log:
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
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java?rev=884635&r1=884634&r2=884635&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
Thu Nov 26 16:47:53 2009
@@ -158,7 +158,7 @@
{
try
{
- reloadBroker();
+ restartBroker();
} catch (Exception e)
{
fail(e.getMessage());
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=884635&r1=884634&r2=884635&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Thu Nov 26 16:47:53 2009
@@ -1263,6 +1263,17 @@
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
+ }
+
}
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
