summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2013-03-15 20:27:32 +0000
committerAlan Conway <aconway@apache.org>2013-03-15 20:27:32 +0000
commitff5323d8a0ab9bca96152896337f498335f0c4b3 (patch)
treeaab9855ef6fad45625748c7652042f4b70856586
parent5dfb88b2d4f7376947894376dc7bd1ccfe4c4761 (diff)
downloadqpid-python-ff5323d8a0ab9bca96152896337f498335f0c4b3.tar.gz
QPID-4640: brokertest.py prints a message and skips tests if qmf.console not available.
Tests that use qmf.console will print a skip message if it is not available. For example: they may not be available when building from a distro rather than a checkout. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457097 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/tests/brokertest.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py
index af1edfee44..7fc3e7f0eb 100644
--- a/qpid/cpp/src/tests/brokertest.py
+++ b/qpid/cpp/src/tests/brokertest.py
@@ -28,7 +28,10 @@ from unittest import TestCase
from copy import copy
from threading import Thread, Lock, Condition
from logging import getLogger
-import qmf.console
+
+try: import qmf.console
+except: print "Cannot import module qmf.console, skipping tests"; exit(0);
+
log = getLogger("qpid.brokertest")