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

1 files changed, 5 insertions, 11 deletions

diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py
index 0efb8182ec..fdcb314751 100755
--- a/qpid/cpp/src/tests/ha_tests.py
+++ b/qpid/cpp/src/tests/ha_tests.py
@@ -1450,15 +1450,9 @@ class TransactionTests(HaBrokerTest):
                     "*.tx.*"], stdout=None, stderr=None).assert_exit_ok()
 
 if __name__ == "__main__":
-    qpid_ha_exec = os.getenv("QPID_HA_EXEC")
-    if qpid_ha_exec and os.path.isfile(qpid_ha_exec):
-        BrokerTest.amqp_tx_warning()
-        outdir = "ha_tests.tmp"
-        shutil.rmtree(outdir, True)
-        os.execvp("qpid-python-test",
-                ["qpid-python-test", "-m", "ha_tests", "-DOUTDIR=%s"%outdir]
-                  + sys.argv[1:])
-    else:
-        print "Skipping ha_tests, qpid-ha not available"
-
+    outdir = "ha_tests.tmp"
+    shutil.rmtree(outdir, True)
+    os.execvp("qpid-python-test",
+            ["qpid-python-test", "-m", "ha_tests", "-DOUTDIR=%s"%outdir]
+              + sys.argv[1:])