diff options
| author | Alan Conway <aconway@apache.org> | 2012-02-24 20:05:47 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-02-24 20:05:47 +0000 |
| commit | 67d8640e8d9315a22c1f54fce885ca8c80b09b2c (patch) | |
| tree | 8e56619a2a259b8370965d6414c096162b190bb0 /qpid/cpp/src/tests | |
| parent | 84aa47345dd4fd972284086e6f3a1f06bd1adb6f (diff) | |
| download | qpid-python-67d8640e8d9315a22c1f54fce885ca8c80b09b2c.tar.gz | |
QPID-3603: Improved command-based qpid-ha tool and ha config option names.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1293397 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rwxr-xr-x | qpid/cpp/src/tests/ha_tests.py | 16 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/test_env.sh.in | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py index dfcec26d46..264a636f29 100755 --- a/qpid/cpp/src/tests/ha_tests.py +++ b/qpid/cpp/src/tests/ha_tests.py @@ -34,20 +34,20 @@ class HaBroker(Broker): args=["--load-module", BrokerTest.ha_lib, # FIXME aconway 2012-02-13: workaround slow link failover. "--link-maintenace-interval=0.1", - "--ha-enable=yes"] - if broker_url: args += [ "--ha-broker-url", broker_url ] + "--ha-cluster=yes"] + if broker_url: args += [ "--ha-brokers", broker_url ] Broker.__init__(self, test, args, **kwargs) def promote(self): - assert os.system("$QPID_HA_TOOL_EXEC --promote %s"%(self.host_port())) == 0 + assert os.system("$QPID_HA_EXEC promote -b %s"%(self.host_port())) == 0 def set_client_url(self, url): assert os.system( - "$QPID_HA_TOOL_EXEC --client-addresses=%s %s"%(url,self.host_port())) == 0 + "$QPID_HA_EXEC set --public-brokers=%s -b %s"%(url,self.host_port())) == 0 def set_broker_url(self, url): assert os.system( - "$QPID_HA_TOOL_EXEC --broker-addresses=%s %s"%(url, self.host_port())) == 0 + "$QPID_HA_EXEC set --brokers=%s -b %s"%(url, self.host_port())) == 0 def set_broker_urls(brokers): url = ",".join([b.host_port() for b in brokers]) @@ -475,10 +475,10 @@ class LongTests(BrokerTest): if __name__ == "__main__": shutil.rmtree("brokertest.tmp", True) - qpid_ha_tool = os.getenv("QPID_HA_TOOL_EXEC") - if qpid_ha_tool and os.path.exists(qpid_ha_tool): + qpid_ha = os.getenv("QPID_HA_EXEC") + if qpid_ha and os.path.exists(qpid_ha): os.execvp("qpid-python-test", ["qpid-python-test", "-m", "ha_tests"] + sys.argv[1:]) else: - print "Skipping ha_tests, qpid_ha_tool not available" + print "Skipping ha_tests, qpid_ha not available" diff --git a/qpid/cpp/src/tests/test_env.sh.in b/qpid/cpp/src/tests/test_env.sh.in index 667a2f0a1b..5c07bcdc2e 100644 --- a/qpid/cpp/src/tests/test_env.sh.in +++ b/qpid/cpp/src/tests/test_env.sh.in @@ -44,7 +44,7 @@ export PYTHONPATH=$srcdir:$PYTHON_DIR:$PYTHON_COMMANDS:$QPID_TESTS_PY:$QMF_LIB:$ export QPID_CONFIG_EXEC=$PYTHON_COMMANDS/qpid-config export QPID_ROUTE_EXEC=$PYTHON_COMMANDS/qpid-route export QPID_CLUSTER_EXEC=$PYTHON_COMMANDS/qpid-cluster -export QPID_HA_TOOL_EXEC=$PYTHON_COMMANDS/qpid-ha-tool +export QPID_HA_EXEC=$PYTHON_COMMANDS/qpid-ha # Executables export QPIDD_EXEC=$top_builddir/src/qpidd |