Skip to content

Commit

Permalink
AVRO-640. Python: Fix path to sources in RPC interop tests.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/avro/trunk@990265 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
cutting committed Aug 27, 2010
1 parent bdedfc8 commit 72d74a4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGES.txt
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions lang/py/build.xml
Expand Up @@ -119,7 +119,6 @@
<exclude name="test_datafile_interop.py"/>
</fileset>
</py-test>
<delete dir="${build.dir}"/>
</target>

<target name="interop-data-test"
Expand All @@ -132,7 +131,6 @@
<include name="test_datafile_interop.py"/>
</fileset>
</py-test>
<delete dir="${build.dir}"/>
</target>

<target name="interop-data-generate"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions share/test/interop/bin/test_rpc_interop.sh
Expand Up @@ -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")
Expand All @@ -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
Expand Down

0 comments on commit 72d74a4

Please sign in to comment.