Modified: qpid/branches/java-broker-0-10/qpid/python/qpid_config.py URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/python/qpid_config.py?rev=821770&r1=821769&r2=821770&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/python/qpid_config.py (original) +++ qpid/branches/java-broker-0-10/qpid/python/qpid_config.py Mon Oct 5 12:26:55 2009 @@ -19,7 +19,7 @@ import os -qpid_home = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -amqp_spec = os.path.join(qpid_home, "specs", "amqp.0-10-qpid-errata.xml") -amqp_spec_0_8 = os.path.join(qpid_home, "specs", "amqp.0-8.xml") -amqp_spec_0_9 = os.path.join(qpid_home, "specs", "amqp.0-9.xml") +AMQP_SPEC_DIR=os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "specs") +amqp_spec = os.path.join(AMQP_SPEC_DIR, "amqp.0-10-qpid-errata.xml") +amqp_spec_0_8 = os.path.join(AMQP_SPEC_DIR, "amqp.0-8.xml") +amqp_spec_0_9 = os.path.join(AMQP_SPEC_DIR, "amqp.0-9.xml")
Modified: qpid/branches/java-broker-0-10/qpid/python/tests/datatypes.py URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/python/tests/datatypes.py?rev=821770&r1=821769&r2=821770&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/python/tests/datatypes.py (original) +++ qpid/branches/java-broker-0-10/qpid/python/tests/datatypes.py Mon Oct 5 12:26:55 2009 @@ -54,6 +54,19 @@ d[serial(0)] = "zero" assert d[0] == "zero" + def testAdd(self): + assert serial(2) + 2 == serial(4) + assert serial(2) + 2 == 4 + + def testSub(self): + delta = serial(4) - serial(2) + assert isinstance(delta, int) or isinstance(delta, long) + assert delta == 2 + + delta = serial(4) - 2 + assert isinstance(delta, Serial) + assert delta == serial(2) + class RangedSetTest(TestCase): def check(self, ranges): Modified: qpid/branches/java-broker-0-10/qpid/python/tests_0-10/management.py URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/python/tests_0-10/management.py?rev=821770&r1=821769&r2=821770&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/python/tests_0-10/management.py (original) +++ qpid/branches/java-broker-0-10/qpid/python/tests_0-10/management.py Mon Oct 5 12:26:55 2009 @@ -29,13 +29,13 @@ Tests for the management hooks """ - def disabled_test_broker_connectivity_oldAPI (self): + def test_broker_connectivity_oldAPI (self): """ Call the "echo" method on the broker to verify it is alive and talking. """ session = self.session - mc = managementClient (session.spec) + mc = managementClient () mch = mc.addChannel (session) mc.syncWaitForStable (mch) Propchange: qpid/branches/java-broker-0-10/qpid/python/tests_0-9/queue.py ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 5 12:26:55 2009 @@ -0,0 +1 @@ +/qpid/trunk/qpid/python/tests_0-9/queue.py:804203-807984 Modified: qpid/branches/java-broker-0-10/qpid/specs/management-schema.xml URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/specs/management-schema.xml?rev=821770&r1=821769&r2=821770&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/specs/management-schema.xml (original) +++ qpid/branches/java-broker-0-10/qpid/specs/management-schema.xml Mon Oct 5 12:26:55 2009 @@ -164,11 +164,13 @@ =============================================================== --> <class name="Exchange"> - <property name="vhostRef" type="objId" references="Vhost" access="RC" index="y" parentRef="y"/> - <property name="name" type="sstr" access="RC" index="y"/> - <property name="type" type="sstr" access="RO"/> - <property name="durable" type="bool" access="RC"/> - <property name="arguments" type="map" access="RO" desc="Arguments supplied in exchange.declare"/> + <property name="vhostRef" type="objId" references="Vhost" access="RC" index="y" parentRef="y"/> + <property name="name" type="sstr" access="RC" index="y"/> + <property name="type" type="sstr" access="RO"/> + <property name="durable" type="bool" access="RO"/> + <property name="autoDelete" type="bool" access="RO"/> + <property name="altExchange" type="objId" access="RO" optional="y"/> + <property name="arguments" type="map" access="RO" desc="Arguments supplied in exchange.declare"/> <statistic name="producerCount" type="hilo32" desc="Current producers on exchange"/> <statistic name="bindingCount" type="hilo32" desc="Current bindings"/> --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
