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

6 files changed, 29 insertions, 8 deletions

diff --git a/qpid/python/examples/direct/declare_queues.py b/qpid/python/examples/direct/declare_queues.py
index 0160f66a1d..f39f0c3349 100644..100755
--- a/qpid/python/examples/direct/declare_queues.py
+++ b/qpid/python/examples/direct/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/qpid/python/examples/direct/direct_consumer.py b/qpid/python/examples/direct/direct_consumer.py
index 38b1ba30a0..85c1db0a93 100644..100755
--- a/qpid/python/examples/direct/direct_consumer.py
+++ b/qpid/python/examples/direct/direct_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/qpid/python/examples/direct/direct_producer.py b/qpid/python/examples/direct/direct_producer.py
index ff662477ce..2c07bfd8e7 100644..100755
--- a/qpid/python/examples/direct/direct_producer.py
+++ b/qpid/python/examples/direct/direct_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/qpid/python/examples/direct/listener.py b/qpid/python/examples/direct/listener.py
index 8324cc76a6..2dbd502fa0 100644..100755
--- a/qpid/python/examples/direct/listener.py
+++ b/qpid/python/examples/direct/listener.py
@@ -8,6 +8,7 @@
 """
 
 import qpid
+import sys
 from qpid.client  import Client
 from qpid.content import Content
 from qpid.queue   import Empty
@@ -40,8 +41,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/qpid/python/examples/direct/verify b/qpid/python/examples/direct/verify
new file mode 100644
index 0000000000..01d81a18a1
--- /dev/null
+++ b/qpid/python/examples/direct/verify
@@ -0,0 +1,3 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+clients ./declare_queues.py ./direct_producer.py ./direct_consumer.py
+outputs ./declare_queues.py.out ./direct_producer.py.out ./direct_consumer.py.out
diff --git a/qpid/python/examples/direct/verify.in b/qpid/python/examples/direct/verify.in
new file mode 100644
index 0000000000..e0dca33039
--- /dev/null
+++ b/qpid/python/examples/direct/verify.in
@@ -0,0 +1,14 @@
+==== ./declare_queues.py.out
+==== ./direct_producer.py.out
+==== ./direct_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!