You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by cu...@apache.org on 2010/08/27 22:52:45 UTC

svn commit: r990265 - in /avro/trunk: CHANGES.txt lang/py/build.xml share/test/interop/bin/test_rpc_interop.sh

Author: cutting
Date: Fri Aug 27 20:52:45 2010
New Revision: 990265

URL: http://svn.apache.org/viewvc?rev=990265&view=rev
Log:
AVRO-640.  Python: Fix path to sources in RPC interop tests.

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/py/build.xml
    avro/trunk/share/test/interop/bin/test_rpc_interop.sh

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=990265&r1=990264&r2=990265&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Fri Aug 27 20:52:45 2010
@@ -203,6 +203,8 @@ Avro 1.4.0 (unreleased)
     AVRO-633. Ruby: Implement skip_union to correct issues with
     updating protocols
 
+    AVRO-640. Python: Fix path to sources in RPC interop test.  (cutting)
+
 Avro 1.3.3 (7 June 2010)
 
   IMPROVEMENTS

Modified: avro/trunk/lang/py/build.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/build.xml?rev=990265&r1=990264&r2=990265&view=diff
==============================================================================
--- avro/trunk/lang/py/build.xml (original)
+++ avro/trunk/lang/py/build.xml Fri Aug 27 20:52:45 2010
@@ -119,7 +119,6 @@
         <exclude name="test_datafile_interop.py"/>
       </fileset>
     </py-test>
-    <delete dir="${build.dir}"/>
   </target>
 
   <target name="interop-data-test"
@@ -132,7 +131,6 @@
         <include name="test_datafile_interop.py"/>
       </fileset>
     </py-test>
-    <delete dir="${build.dir}"/>
   </target>
 
   <target name="interop-data-generate"
@@ -145,7 +143,6 @@
       <arg value="${share.dir}/test/schemas/interop.avsc"/>
       <arg value="${interop.data.dir}/py.avro"/>
     </exec>
-    <delete dir="${build.dir}"/>
   </target>
 
   <target name="dist"

Modified: avro/trunk/share/test/interop/bin/test_rpc_interop.sh
URL: http://svn.apache.org/viewvc/avro/trunk/share/test/interop/bin/test_rpc_interop.sh?rev=990265&r1=990264&r2=990265&view=diff
==============================================================================
--- avro/trunk/share/test/interop/bin/test_rpc_interop.sh (original)
+++ avro/trunk/share/test/interop/bin/test_rpc_interop.sh Fri Aug 27 20:52:45 2010
@@ -26,13 +26,13 @@ VERSION=`cat share/VERSION.txt`
 java_client="java -jar lang/java/build/avro-tools-$VERSION.jar rpcsend"
 java_server="java -jar lang/java/build/avro-tools-$VERSION.jar rpcreceive"
 
-py_client="python lang/py/src/avro/tool.py rpcsend"
-py_server="python lang/py/src/avro/tool.py rpcreceive"
+py_client="python lang/py/build/src/avro/tool.py rpcsend"
+py_server="python lang/py/build/src/avro/tool.py rpcreceive"
 
 ruby_client="ruby -rubygems -Ilang/ruby/lib lang/ruby/test/tool.rb rpcsend"
 ruby_server="ruby -rubygems -Ilang/ruby/lib lang/ruby/test/tool.rb rpcreceive"
 
-export PYTHONPATH=lang/py/src                     # path to avro Python module
+export PYTHONPATH=lang/py/build/src	  # path to avro Python module
 
 clients=("$java_client" "$py_client" "$ruby_client")
 servers=("$java_server" "$py_server" "$ruby_server")
@@ -58,7 +58,7 @@ do
 	    echo TEST: $c
 	    for client in "${clients[@]}"
 	    do
-		$server http://0.0.0.0:0/ $proto $msg -file $c/response.avro \
+		$server http://127.0.0.1:0/ $proto $msg -file $c/response.avro \
 		    > $portfile &
 		sleep 1				  # wait for server to start
 		read ignore port < $portfile