forked python tests for 0-10 preview and 0-10 final

fixed result handling in c++ broker
modified testlib in python to allow new 0-10 client to be run as well
converted query tests for final 0-10
added python tests for 0-10 final to automated set for c++ broker (most unconverted still)



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

1 files changed, 36 insertions, 11 deletions

diff --git a/python/qpid/testlib.py b/python/qpid/testlib.py
index 5174fe10f4..e8e54b3a56 100644
--- a/python/qpid/testlib.py
+++ b/python/qpid/testlib.py
@@ -29,6 +29,11 @@ from getopt import getopt, GetoptError
 from qpid.content import Content
 from qpid.message import Message
 
+#0-10 support
+from qpid.connection010 import Connection
+from qpid.spec010 import load
+from qpid.util import connect
+
 def findmodules(root):
     """Find potential python modules under directory root"""
     found = []
@@ -125,23 +130,29 @@ Options:
             if opt in ("-S", "--skip-self-test"): self.skip_self_test = True
             if opt in ("-F", "--spec-folder"): TestRunner.SPEC_FOLDER = value
 	# Abbreviations for default settings.
-        if (self.specfile == "0-8"):
-       	    self.specfile = self.get_spec_file("amqp.0-8.xml")
-        elif (self.specfile == "0-9"):
-            self.specfile = self.get_spec_file("amqp.0-9.xml")
-            self.errata.append(self.get_spec_file("amqp-errata.0-9.xml"))
-
-	if (self.specfile == None):
-	    self._die("No XML specification provided")
-        print "Using specification from:", self.specfile
-        self.spec = qpid.spec.load(self.specfile, *self.errata)
+        if (self.specfile == "0-10"):
+            self.spec = load(self.get_spec_file("amqp.0-10.xml"))
+        else:    
+            if (self.specfile == "0-8"):
+                self.specfile = self.get_spec_file("amqp.0-8.xml")
+            elif (self.specfile == "0-9"):
+                self.specfile = self.get_spec_file("amqp.0-9.xml")
+                self.errata.append(self.get_spec_file("amqp-errata.0-9.xml"))
+                
+                if (self.specfile == None):
+                    self._die("No XML specification provided")
+                    print "Using specification from:", self.specfile
+
+            self.spec = qpid.spec.load(self.specfile, *self.errata)
 
         if len(self.tests) == 0:
             if not self.skip_self_test:
                 self.tests=findmodules("tests")
             if self.use08spec():
                 self.tests+=findmodules("tests_0-8")
-            elif (self.spec.major == 0 and self.spec.minor == 10) or (self.spec.major == 99 and self.spec.minor == 0):
+            elif (self.spec.major == 99 and self.spec.minor == 0):
+                self.tests+=findmodules("tests_0-10_preview")                
+            elif (self.spec.major == 0 and self.spec.minor == 10):
                 self.tests+=findmodules("tests_0-10")
             else:
                 self.tests+=findmodules("tests_0-9")
@@ -330,3 +341,17 @@ class TestBase(unittest.TestCase):
         self.assertEqual("close", message.method.name)
         self.assertEqual(expectedCode, message.reply_code)
 
+class TestBase010(unittest.TestCase):
+    """
+    Base class for Qpid test cases. using the final 0-10 spec
+    """
+
+    def setUp(self):
+        spec = testrunner.spec
+        self.conn = Connection(connect(testrunner.host, testrunner.port), spec)
+        self.conn.start(timeout=10)        
+        self.session = self.conn.session("test-session", timeout=10)
+
+    def tearDown(self):
+        self.session.close(timeout=10)
+        self.conn.close(timeout=10)