Update to start M2.1 python test broker on port 2100 (management 2101) and for the tests to use that broker.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579198 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 10 insertions, 5 deletions

diff --git a/java/broker/etc/log4j.xml b/java/broker/etc/log4j.xml
index 2060246b7f..af8e7a8293 100644
--- a/java/broker/etc/log4j.xml
+++ b/java/broker/etc/log4j.xml
@@ -76,6 +76,7 @@
     <category name="Qpid.Broker">
         <priority value="debug"/>
         <appender-ref ref="AlertFile"/>
+        <appender-ref ref="STDOUT"/>
     </category>
 
     <category name="org.apache.qpid.server.queue.AMQQueueMBean">
diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index 5444572c0a..9e38751d62 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -209,7 +209,7 @@
                                     </condition>
 
                                     <property name="command" 
-                                              value="python run-tests -v -I java_failing.txt"/>
+                                              value="python run-tests -v -I java_failing.txt -b localhost:2100"/>
                                     <!--value="bash -c 'python run-tests -v -I java_failing.txt'"/>-->
 
                                     <ant antfile="python-test.xml" inheritRefs="true">
diff --git a/java/broker/python-test.xml b/java/broker/python-test.xml
index 5212f2d384..e58ae399b9 100755
--- a/java/broker/python-test.xml
+++ b/java/broker/python-test.xml
@@ -42,8 +42,12 @@ under the License.
 			failonerror="true"
 			>
 		<arg value="${command}"/>
-		
-		<classpath refid="maven.test.classpath"/>
+        <arg value="-p"/>
+        <arg value="2100"/>
+        <arg value="-m"/>
+        <arg value="2101"/>
+
+        <classpath refid="maven.test.classpath"/>
 		<sysproperty key="QPID_HOME" value="${broker.dir}"/>
 		<sysproperty key="QPID_WORK" value="${broker.dir}${file.separator}target"/>
 	</java>
diff --git a/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java b/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
index 1ebecbacb6..b8803206e0 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
@@ -33,11 +33,11 @@ public class RunBrokerWithCommand
     public static void main(String[] args)
     {
         //Start broker
-
         try
         {
+            String[] fudge = args.clone();
 
-            String[] fudge = new String[1];
+            // Override the first value which is the command we are going to run later.
             fudge[0] = "-v";
             new Main(fudge).startup();
         }