diff options
Diffstat (limited to 'python/qpid')
| -rw-r--r-- | python/qpid/codec010.py | 10 | ||||
| -rw-r--r-- | python/qpid/testlib.py | 47 |
2 files changed, 44 insertions, 13 deletions
diff --git a/python/qpid/codec010.py b/python/qpid/codec010.py index 5894981fc6..2dcba4e917 100644 --- a/python/qpid/codec010.py +++ b/python/qpid/codec010.py @@ -111,6 +111,11 @@ class Codec(Packer): def write_str8(self, s): self.write_vbin8(s.encode("utf8")) + def read_str16(self): + return self.read_vbin16().decode("utf8") + def write_str16(self, s): + self.write_vbin16(s.encode("utf8")) + def read_vbin16(self): return self.read(self.read_uint16()) @@ -125,9 +130,10 @@ class Codec(Packer): self.write(b) def write_map(self, m): - pass + self.write_uint32(0) #hack def read_map(self): - pass + size = self.read_uint32() #hack + self.read(size) #hack def write_array(self, a): pass 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) |