diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-11 03:13:15 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-11 03:13:15 +0000 |
commit | bd76aa29d2df9104d6989d6aa7b81dc3db1d455c (patch) | |
tree | 42df821fafe597fc5c7aaed793702bac2fea6c9c /sca-cpp/trunk/modules | |
parent | 2120ffe5068a7a8078c04475816295708248b63b (diff) |
Add test scripts to test the WSGI integration on the GAE SDK.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@932833 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-cpp/trunk/modules/wsgi/Makefile.am | 10 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/wsgi/gae-start | 29 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/wsgi/gae-stop | 29 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/wsgi/gae-test | 30 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/wsgi/http-test | 4 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/wsgi/server-test | 4 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/wsgi/wiring-test | 4 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/wsgi/wsgi-start | 4 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/wsgi/wsgi-stop | 3 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/wsgi/wsgi-test | 4 |
10 files changed, 111 insertions, 10 deletions
diff --git a/sca-cpp/trunk/modules/wsgi/Makefile.am b/sca-cpp/trunk/modules/wsgi/Makefile.am index f14087b9c4..7678104761 100644 --- a/sca-cpp/trunk/modules/wsgi/Makefile.am +++ b/sca-cpp/trunk/modules/wsgi/Makefile.am @@ -33,10 +33,20 @@ target.stamp: app.yaml *.py *.composite htdocs/* clean-local: rm -rf target.stamp target +prefix_DATA = gae.prefix +prefixdir=$(prefix)/modules/wsgi +gae.prefix: $(top_builddir)/config.status + echo ${GAE_PREFIX} >gae.prefix + client_test_SOURCES = client-test.cpp client_test_LDFLAGS = -lxml2 -lcurl -lmozjs noinst_PROGRAMS = client-test + +if WANT_GAE +TESTS = util-test wsgi-test wiring-test http-test server-test gae-test +else TESTS = util-test wsgi-test wiring-test http-test server-test +endif endif diff --git a/sca-cpp/trunk/modules/wsgi/gae-start b/sca-cpp/trunk/modules/wsgi/gae-start new file mode 100755 index 0000000000..69882750aa --- /dev/null +++ b/sca-cpp/trunk/modules/wsgi/gae-start @@ -0,0 +1,29 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Start Google AppEngine server +here=`readlink -f $0`; here=`dirname $here` +root=`readlink -f $1` +port=$2 + +python_prefix=`cat $here/../python/python.prefix` +gae_prefix=`cat $here/gae.prefix` +cd $root +$python_prefix/bin/python $gae_prefix/dev_appserver.py -p $port $root & + diff --git a/sca-cpp/trunk/modules/wsgi/gae-stop b/sca-cpp/trunk/modules/wsgi/gae-stop new file mode 100755 index 0000000000..64e7031058 --- /dev/null +++ b/sca-cpp/trunk/modules/wsgi/gae-stop @@ -0,0 +1,29 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Stop Google AppEngine server +here=`readlink -f $0`; here=`dirname $here` +root=`readlink -f $1` +port=$2 + +python_prefix=`cat $here/../python/python.prefix` +gae_prefix=`cat $here/gae.prefix` +py="$python_prefix/bin/python $gae_prefix/dev_appserver.py -p $port $root" + +kill `ps -ef | grep -v grep | grep "${py}" | awk '{ print $2 }'` diff --git a/sca-cpp/trunk/modules/wsgi/gae-test b/sca-cpp/trunk/modules/wsgi/gae-test new file mode 100755 index 0000000000..1791a830ca --- /dev/null +++ b/sca-cpp/trunk/modules/wsgi/gae-test @@ -0,0 +1,30 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Setup +./gae-start target 8090 2>/dev/null +sleep 2 + +# Test +./client-test 2>/dev/null +rc=$? + +# Cleanup +./gae-stop target 8090 +return $rc diff --git a/sca-cpp/trunk/modules/wsgi/http-test b/sca-cpp/trunk/modules/wsgi/http-test index 844cea53fd..6676f6514c 100755 --- a/sca-cpp/trunk/modules/wsgi/http-test +++ b/sca-cpp/trunk/modules/wsgi/http-test @@ -24,7 +24,7 @@ fi # Setup mkdir -p tmp -./wsgi-start 8090 2>/dev/null +./wsgi-start target 8090 2>/dev/null sleep 2 # Test JSON-RPC @@ -34,6 +34,6 @@ $python_prefix/bin/python http-test.py rc=$? # Cleanup -./wsgi-stop 8090 +./wsgi-stop target 8090 sleep 2 return $rc diff --git a/sca-cpp/trunk/modules/wsgi/server-test b/sca-cpp/trunk/modules/wsgi/server-test index 3220cd2d3e..9bd862c53a 100755 --- a/sca-cpp/trunk/modules/wsgi/server-test +++ b/sca-cpp/trunk/modules/wsgi/server-test @@ -18,7 +18,7 @@ # under the License. # Setup -./wsgi-start 8090 2>/dev/null +./wsgi-start target 8090 2>/dev/null sleep 2 # Test @@ -26,5 +26,5 @@ sleep 2 rc=$? # Cleanup -./wsgi-stop 8090 +./wsgi-stop target 8090 return $rc diff --git a/sca-cpp/trunk/modules/wsgi/wiring-test b/sca-cpp/trunk/modules/wsgi/wiring-test index e7747484f7..f1d0e8332f 100755 --- a/sca-cpp/trunk/modules/wsgi/wiring-test +++ b/sca-cpp/trunk/modules/wsgi/wiring-test @@ -27,7 +27,7 @@ fi # Setup mkdir -p tmp -./wsgi-start 8090 2>/dev/null +./wsgi-start target 8090 2>/dev/null sleep 2 # Test HTTP GET @@ -67,7 +67,7 @@ if [ "$rc" = "0" ]; then fi # Cleanup -./wsgi-stop 8090 +./wsgi-stop target 8090 sleep 2 if [ "$rc" = "0" ]; then echo "OK" diff --git a/sca-cpp/trunk/modules/wsgi/wsgi-start b/sca-cpp/trunk/modules/wsgi/wsgi-start index 92606d5094..d020f3da14 100755 --- a/sca-cpp/trunk/modules/wsgi/wsgi-start +++ b/sca-cpp/trunk/modules/wsgi/wsgi-start @@ -19,8 +19,10 @@ # Start WSGI server here=`readlink -f $0`; here=`dirname $here` -port=$1 +root=`readlink -f $1` +port=$2 python_prefix=`cat $here/../python/python.prefix` +cd $root $python_prefix/bin/python composite.py $port & diff --git a/sca-cpp/trunk/modules/wsgi/wsgi-stop b/sca-cpp/trunk/modules/wsgi/wsgi-stop index d1e09185f4..7e12967adb 100755 --- a/sca-cpp/trunk/modules/wsgi/wsgi-stop +++ b/sca-cpp/trunk/modules/wsgi/wsgi-stop @@ -19,7 +19,8 @@ # Stop WSGI server here=`readlink -f $0`; here=`dirname $here` -port=$1 +root=`readlink -f $1` +port=$2 python_prefix=`cat $here/../python/python.prefix` py="$python_prefix/bin/python composite.py $port" diff --git a/sca-cpp/trunk/modules/wsgi/wsgi-test b/sca-cpp/trunk/modules/wsgi/wsgi-test index ed73940c94..3dce709a3b 100755 --- a/sca-cpp/trunk/modules/wsgi/wsgi-test +++ b/sca-cpp/trunk/modules/wsgi/wsgi-test @@ -23,7 +23,7 @@ curl_prefix=`cat $here/../http/curl.prefix` # Setup mkdir -p tmp -./wsgi-start 8090 2>/dev/null +./wsgi-start target 8090 2>/dev/null sleep 2 # Test HTTP GET @@ -63,7 +63,7 @@ if [ "$rc" = "0" ]; then fi # Cleanup -./wsgi-stop 8090 +./wsgi-stop target 8090 sleep 2 if [ "$rc" = "0" ]; then echo "OK" |