Refactored verify scripts, added verify for python Examples.

To verify an example: <qpid-trunk>/bin/verify <example-dir>
See comments in bin/verify for more details.

Changes: 
 - Each example dir has its own verify script and verify.in.
 - Added sys.stdout.flush() to som python examples so verify can tell when they're ready.
 - Made python examples svn:executable.
 - C++ examples/Makefile.am runs python examples


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@619903 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 63 insertions, 7 deletions

diff --git a/qpid/python/examples/pubsub/topic_publisher.py b/qpid/python/examples/pubsub/topic_publisher.py
index 1ff983b315..e302d58ad4 100644..100755
--- a/qpid/python/examples/pubsub/topic_publisher.py
+++ b/qpid/python/examples/pubsub/topic_publisher.py
@@ -8,6 +8,7 @@
 """
 
 import qpid
+import sys
 from qpid.client import Client
 from qpid.content import Content
 from qpid.queue import Empty
@@ -15,9 +16,8 @@ from qpid.queue import Empty
 #----- Initialization -----------------------------------
 
 #  Set parameters for login. 
-
-host="127.0.0.1"
-port=5672
+host=len(sys.argv) > 1 and sys.argv[1] or "127.0.0.1"
+port=len(sys.argv) > 2 and int(sys.argv[2]) or 5672
 amqp_spec="/usr/share/amqp/amqp.0-10-preview.xml"
 user="guest"
 password="guest"
diff --git a/qpid/python/examples/pubsub/topic_subscriber.py b/qpid/python/examples/pubsub/topic_subscriber.py
index 52ec67b77c..a5c05ba177 100644..100755
--- a/qpid/python/examples/pubsub/topic_subscriber.py
+++ b/qpid/python/examples/pubsub/topic_subscriber.py
@@ -7,7 +7,7 @@
 """
 
 import base64
-
+import sys
 import qpid
 from qpid.client import Client
 from qpid.content import Content
@@ -60,8 +60,8 @@ def dump_queue(client, queue_name):
 
 #  Set parameters for login
 
-host="127.0.0.1"
-port=5672
+host=len(sys.argv) > 1 and sys.argv[1] or "127.0.0.1"
+port=len(sys.argv) > 2 and int(sys.argv[2]) or 5672
 amqp_spec="/usr/share/amqp/amqp.0-10-preview.xml"
 user="guest"
 password="guest"
@@ -108,7 +108,8 @@ session.queue_bind(exchange="amq.topic", queue=europe, routing_key="control")
 
 # Remind the user to start the topic producer
 
-print "Queues create - please start the topic producer"
+print "Queues created - please start the topic producer"
+sys.stdout.flush()
 
 # Call dump_queue to print messages from each queue
 
diff --git a/qpid/python/examples/pubsub/verify b/qpid/python/examples/pubsub/verify
new file mode 100644
index 0000000000..bef233b4ff
--- /dev/null
+++ b/qpid/python/examples/pubsub/verify
@@ -0,0 +1,4 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+background "Queues created" ./topic_subscriber.py
+clients ./topic_publisher.py
+outputs ./topic_publisher.py.out "topic_subscriber.py.out | remove_uuid64 | sort"
diff --git a/qpid/python/examples/pubsub/verify.in b/qpid/python/examples/pubsub/verify.in
new file mode 100644
index 0000000000..19dcf88312
--- /dev/null
+++ b/qpid/python/examples/pubsub/verify.in
@@ -0,0 +1,51 @@
+==== ./topic_publisher.py.out
+==== topic_subscriber.py.out | remove_uuid64 | sort
+message 0
+message 0
+message 0
+message 0
+message 0
+message 0
+message 0
+message 0
+message 1
+message 1
+message 1
+message 1
+message 1
+message 1
+message 1
+message 1
+message 2
+message 2
+message 2
+message 2
+message 2
+message 2
+message 2
+message 2
+message 3
+message 3
+message 3
+message 3
+message 3
+message 3
+message 3
+message 3
+message 4
+message 4
+message 4
+message 4
+message 4
+message 4
+message 4
+message 4
+Messages queue: europe
+Messages queue: news
+Messages queue: usa
+Messages queue: weather
+Queues created - please start the topic producer
+That's all, folks!
+That's all, folks!
+That's all, folks!
+That's all, folks!