You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2008/05/15 23:34:10 UTC
svn commit: r656853 - in /incubator/qpid/trunk/qpid: cpp/examples/
cpp/src/tests/ python/examples/direct/ python/examples/fanout/
python/examples/pubsub/ python/examples/request-response/
python/examples/xml-exchange/
Author: aconway
Date: Thu May 15 14:34:10 2008
New Revision: 656853
URL: http://svn.apache.org/viewvc?rev=656853&view=rev
Log:
- Enable python tets and examples in make rpmbuild.
- Remove hard-coded amqp.xml paths from python examples.
Modified:
incubator/qpid/trunk/qpid/cpp/examples/verify_all
incubator/qpid/trunk/qpid/cpp/src/tests/python_tests
incubator/qpid/trunk/qpid/python/examples/direct/declare_queues.py
incubator/qpid/trunk/qpid/python/examples/direct/direct_consumer.py
incubator/qpid/trunk/qpid/python/examples/direct/direct_producer.py
incubator/qpid/trunk/qpid/python/examples/direct/listener.py
incubator/qpid/trunk/qpid/python/examples/fanout/fanout_consumer.py
incubator/qpid/trunk/qpid/python/examples/fanout/fanout_producer.py
incubator/qpid/trunk/qpid/python/examples/fanout/listener.py
incubator/qpid/trunk/qpid/python/examples/pubsub/topic_publisher.py
incubator/qpid/trunk/qpid/python/examples/pubsub/topic_subscriber.py
incubator/qpid/trunk/qpid/python/examples/request-response/client.py
incubator/qpid/trunk/qpid/python/examples/request-response/server.py
incubator/qpid/trunk/qpid/python/examples/xml-exchange/declare_queues.py
incubator/qpid/trunk/qpid/python/examples/xml-exchange/listener.py
incubator/qpid/trunk/qpid/python/examples/xml-exchange/xml_consumer.py
incubator/qpid/trunk/qpid/python/examples/xml-exchange/xml_producer.py
Modified: incubator/qpid/trunk/qpid/cpp/examples/verify_all
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/verify_all?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/verify_all (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/verify_all Thu May 15 14:34:10 2008
@@ -6,16 +6,14 @@
topsrcdir=$1
qpidd=$2
exclude_regexp=$3
-
-python=$topsrcdir/python
+python=${QPID_PYTHON_DIR:-$topsrcdir/python}
trap "$qpidd -q" exit
export QPID_PORT=`$qpidd -dp0 --data-dir "" --auth no` || { echo "Can't run qpidd" ; exit 1; }
export PYTHON_EXAMPLES=$python/examples
export PYTHONPATH=$python:$PYTHONPATH
-export AMQP_SPEC=$topsrcdir/specs/amqp.0-10.xml
-test -d $PYTHON_EXAMPLES || echo "Warning: not verifying python examples, $PYTHON_EXAMPLES not found"
+test -d $PYTHON_EXAMPLES || echo "WARNING: No python examples. $PYTHON_EXAMPLES not found."
find="find examples"
test -d $PYTHON_EXAMPLES && find="$find $PYTHON_EXAMPLES"
find="$find -name verify"
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/python_tests
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/python_tests?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/python_tests (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/python_tests Thu May 15 14:34:10 2008
@@ -3,7 +3,7 @@
QPID_PORT=${QPID_PORT:-5672}
PYTHON_TESTS=${PYTHON_TESTS:-$*}
MY_DIR=$(dirname $(which $0))
-PYTHON_DIR=${QPID_PYTHON_DIR:-${MY_DIR}/../../../python}
+QPID_PYTHON_DIR=${QPID_PYTHON_DIR:-${MY_DIR}/../../../python}
run() {
SPEC=$1
@@ -11,9 +11,9 @@
./run-tests --skip-self-test -v -s $SPEC -I $FAILING -b localhost:$QPID_PORT $PYTHON_TESTS || { echo "FAIL python tests for $SPEC"; exit 1; }
}
-if test -d ${PYTHON_DIR} ; then
- cd ${PYTHON_DIR}
+if test -d ${QPID_PYTHON_DIR} ; then
+ cd ${QPID_PYTHON_DIR}
run 0-10-errata cpp_failing_0-10.txt
else
- echo Warning: python tests not found.
+ echo "WARNING: No python tests. $QPID_PYTHON_DIR not found."
fi
Modified: incubator/qpid/trunk/qpid/python/examples/direct/declare_queues.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/direct/declare_queues.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/direct/declare_queues.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/direct/declare_queues.py Thu May 15 14:34:10 2008
@@ -26,7 +26,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -39,14 +38,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/direct/direct_consumer.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/direct/direct_consumer.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/direct/direct_consumer.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/direct/direct_consumer.py Thu May 15 14:34:10 2008
@@ -24,7 +24,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -37,14 +36,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/direct/direct_producer.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/direct/direct_producer.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/direct/direct_producer.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/direct/direct_producer.py Thu May 15 14:34:10 2008
@@ -24,7 +24,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -37,14 +36,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/direct/listener.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/direct/listener.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/direct/listener.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/direct/listener.py Thu May 15 14:34:10 2008
@@ -45,7 +45,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -58,14 +57,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/fanout/fanout_consumer.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/fanout/fanout_consumer.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/fanout/fanout_consumer.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/fanout/fanout_consumer.py Thu May 15 14:34:10 2008
@@ -22,7 +22,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -35,14 +34,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/fanout/fanout_producer.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/fanout/fanout_producer.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/fanout/fanout_producer.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/fanout/fanout_producer.py Thu May 15 14:34:10 2008
@@ -21,7 +21,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -34,14 +33,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/fanout/listener.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/fanout/listener.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/fanout/listener.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/fanout/listener.py Thu May 15 14:34:10 2008
@@ -42,7 +42,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -55,14 +54,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/pubsub/topic_publisher.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/pubsub/topic_publisher.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/pubsub/topic_publisher.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/pubsub/topic_publisher.py Thu May 15 14:34:10 2008
@@ -30,7 +30,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -43,14 +42,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/pubsub/topic_subscriber.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/pubsub/topic_subscriber.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/pubsub/topic_subscriber.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/pubsub/topic_subscriber.py Thu May 15 14:34:10 2008
@@ -54,7 +54,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -67,14 +66,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/request-response/client.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/request-response/client.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/request-response/client.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/request-response/client.py Thu May 15 14:34:10 2008
@@ -45,7 +45,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -58,14 +57,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/request-response/server.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/request-response/server.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/request-response/server.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/request-response/server.py Thu May 15 14:34:10 2008
@@ -37,7 +37,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -50,13 +49,8 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/xml-exchange/declare_queues.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/xml-exchange/declare_queues.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/xml-exchange/declare_queues.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/xml-exchange/declare_queues.py Thu May 15 14:34:10 2008
@@ -25,7 +25,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -38,14 +37,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/xml-exchange/listener.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/xml-exchange/listener.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/xml-exchange/listener.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/xml-exchange/listener.py Thu May 15 14:34:10 2008
@@ -42,7 +42,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -55,14 +54,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/xml-exchange/xml_consumer.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/xml-exchange/xml_consumer.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/xml-exchange/xml_consumer.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/xml-exchange/xml_consumer.py Thu May 15 14:34:10 2008
@@ -24,7 +24,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -37,14 +36,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))
Modified: incubator/qpid/trunk/qpid/python/examples/xml-exchange/xml_producer.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/examples/xml-exchange/xml_producer.py?rev=656853&r1=656852&r2=656853&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/examples/xml-exchange/xml_producer.py (original)
+++ incubator/qpid/trunk/qpid/python/examples/xml-exchange/xml_producer.py Thu May 15 14:34:10 2008
@@ -42,7 +42,6 @@
port=5672
user="guest"
password="guest"
-amqp_spec="/usr/share/amqp/amqp.0-10.xml"
# If an alternate host or port has been specified, use that instead
# (this is used in our unit tests)
@@ -55,14 +54,9 @@
if len(sys.argv) > 2 :
port=int(sys.argv[2])
-try:
- amqp_spec = os.environ["AMQP_SPEC"]
-except KeyError:
- amqp_spec="/usr/share/amqp/amqp.0-10.xml"
-
# Create a connection.
socket = connect(host, port)
-connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec))
+connection = Connection (sock=socket)
connection.start()
session = connection.session(str(uuid4()))