diff options
| author | Justin Ross <jross@apache.org> | 2016-04-21 12:31:34 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2016-04-21 12:31:34 +0000 |
| commit | 71149592670f7592886751a9a866459bef0f12cc (patch) | |
| tree | e4d1fd948055e36d1560112a318e77a210506d06 /qpid/cpp/src/tests/brokertest.py | |
| parent | a835fb2724824dcd8a470fb51424cedeb6b38f62 (diff) | |
| download | qpid-python-71149592670f7592886751a9a866459bef0f12cc.tar.gz | |
QPID-7207: Create independent cpp and python subtrees, with content from tools and extras
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1740289 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/brokertest.py')
| -rw-r--r-- | qpid/cpp/src/tests/brokertest.py | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py index 6fae88092b..8c32faad0c 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/cpp/src/tests/brokertest.py @@ -354,7 +354,7 @@ class Broker(Popen): if (self.test.protocol and qm == qpid_messaging): kwargs.setdefault("protocol", self.test.protocol) return connection_class.establish(self.host_port(), timeout=timeout, **kwargs) - + @property def agent(self, **kwargs): """Return a BrokerAgent for this broker""" @@ -477,14 +477,14 @@ class BrokerTest(TestCase): TestCase.__init__(self, *args, **kwargs) # Environment settings. - qpidd_exec = os.path.abspath(checkenv("QPIDD_EXEC")) + qpidd_exec = "qpidd" ha_lib = os.getenv("HA_LIB") xml_lib = os.getenv("XML_LIB") amqp_lib = os.getenv("AMQP_LIB") - qpid_config_exec = os.getenv("QPID_CONFIG_EXEC") - qpid_route_exec = os.getenv("QPID_ROUTE_EXEC") - receiver_exec = os.getenv("RECEIVER_EXEC") - sender_exec = os.getenv("SENDER_EXEC") + qpid_config_exec = "qpid-config" + qpid_route_exec = "qpid-route" + receiver_exec = "receiver" + sender_exec = "sender" sql_store_lib = os.getenv("STORE_SQL_LIB") sql_clfs_store_lib = os.getenv("STORE_SQL_CLFS_LIB") sql_catalog = os.getenv("STORE_CATALOG") @@ -505,19 +505,7 @@ class BrokerTest(TestCase): PN_TX_VERSION = (0, 9) amqp_tx_supported = PN_VERSION >= PN_TX_VERSION - - @classmethod - def amqp_tx_warning(cls): - if not cls.amqp_tx_supported: - if cls.PN_VERSION == (0, 0): - print "WARNING: Cannot test transactions over AMQP 1.0, proton not on path so version could not be determined" - elif cls.PN_VERSION == (0, 7): - print "WARNING: Cannot test transactions over AMQP 1.0, proton version is 0.7 or less, %s.%s required" % cls.PN_TX_VERSION - else: - print "WARNING: Cannot test transactions over AMQP 1.0, proton version %s.%s < %s.%s" % (cls.PN_VERSION + cls.PN_TX_VERSION) - return False - return True - + def configure(self, config): self.config=config def setUp(self): |