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/qpid@619903 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 29 insertions, 8 deletions

diff --git a/python/examples/fanout/declare_queues.py b/python/examples/fanout/declare_queues.py
index 8840ea38e1..52f23f4f9a 100644..100755
--- a/python/examples/fanout/declare_queues.py
+++ b/python/examples/fanout/declare_queues.py
@@ -9,6 +9,7 @@
 """
 
 import qpid
+import sys
 from qpid.client import Client
 from qpid.content import Content
 from qpid.queue import Empty
@@ -17,8 +18,8 @@ from qpid.queue import Empty
 
 #  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/python/examples/fanout/fanout_consumer.py b/python/examples/fanout/fanout_consumer.py
index 8d852ca753..b91ea35c0d 100644..100755
--- a/python/examples/fanout/fanout_consumer.py
+++ b/python/examples/fanout/fanout_consumer.py
@@ -7,6 +7,7 @@
 """
 
 import qpid
+import sys
 from qpid.client import Client
 from qpid.content import Content
 from qpid.queue import Empty
@@ -16,8 +17,8 @@ from qpid.queue import Empty
 
 #  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/python/examples/fanout/fanout_producer.py b/python/examples/fanout/fanout_producer.py
index d9d8f454c8..9864c776c1 100644..100755
--- a/python/examples/fanout/fanout_producer.py
+++ b/python/examples/fanout/fanout_producer.py
@@ -7,6 +7,7 @@
 """
 
 import qpid
+import sys
 from qpid.client import Client
 from qpid.content import Content
 from qpid.queue import Empty
@@ -15,8 +16,8 @@ from qpid.queue import Empty
 
 #  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/python/examples/fanout/listener.py b/python/examples/fanout/listener.py
index 09dd7ddb80..8997c3698f 100644..100755
--- a/python/examples/fanout/listener.py
+++ b/python/examples/fanout/listener.py
@@ -7,6 +7,7 @@
 """
 
 import qpid
+import sys
 from qpid.client  import Client
 from qpid.content import Content
 from qpid.queue   import Empty
@@ -39,8 +40,8 @@ class Receiver:
 
 #  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/python/examples/fanout/verify b/python/examples/fanout/verify
new file mode 100644
index 0000000000..f136ccd39b
--- /dev/null
+++ b/python/examples/fanout/verify
@@ -0,0 +1,3 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+clients ./declare_queues.py ./fanout_producer.py ./fanout_consumer.py
+outputs ./declare_queues.py.out ./fanout_producer.py.out ./fanout_consumer.py.out
diff --git a/python/examples/fanout/verify.in b/python/examples/fanout/verify.in
new file mode 100644
index 0000000000..c625c30773
--- /dev/null
+++ b/python/examples/fanout/verify.in
@@ -0,0 +1,14 @@
+==== ./declare_queues.py.out
+==== ./fanout_producer.py.out
+==== ./fanout_consumer.py.out
+message 0
+message 1
+message 2
+message 3
+message 4
+message 5
+message 6
+message 7
+message 8
+message 9
+That's all, folks!