summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2011-01-19 17:33:14 +0000
committerAlan Conway <aconway@apache.org>2011-01-19 17:33:14 +0000
commitedc8085edae3d1664ab82d736542f5643a7ea7ad (patch)
treede3bae9b1d9b9abbd64ac072391d6e91098a6054
parentb379a8c7dd4209385033ce4c541f506b2550ac00 (diff)
downloadqpid-python-edc8085edae3d1664ab82d736542f5643a7ea7ad.tar.gz
QPID-3007 Disabled cluster log verification tests, causing sporadic failures.
The tests will be re-enabled when QPID-3007 is fixed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1060879 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xqpid/cpp/src/tests/cluster_test_logs.py4
-rwxr-xr-xqpid/cpp/src/tests/cluster_tests.py3
2 files changed, 5 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/cluster_test_logs.py b/qpid/cpp/src/tests/cluster_test_logs.py
index eae28fc4e5..0333822824 100755
--- a/qpid/cpp/src/tests/cluster_test_logs.py
+++ b/qpid/cpp/src/tests/cluster_test_logs.py
@@ -87,6 +87,10 @@ def filter_log(log):
def verify_logs(logs):
"""Compare log files from cluster brokers, verify that they correspond correctly."""
+ # FIXME aconway 2011-01-19: disable when called from unit tests
+ # Causing sporadic failures, see https://issues.apache.org/jira/browse/QPID-3007
+ if __name__ != "__main__": return
+
for l in glob.glob("*.log"): filter_log(l)
checkpoints = set()
for l in glob.glob("*.filter"): checkpoints = checkpoints.union(set(split_log(l)))
diff --git a/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py
index 9bfd1b2d89..6e515cdbf1 100755
--- a/qpid/cpp/src/tests/cluster_tests.py
+++ b/qpid/cpp/src/tests/cluster_tests.py
@@ -448,8 +448,7 @@ class LongTests(BrokerTest):
c.stop()
# Verify that logs are consistent
- # FIXME aconway 2011-01-11: disabled due to known bugs, see QPID-2982
- # cluster_test_logs.verify_logs(glob.glob("*.log"))
+ cluster_test_logs.verify_logs(glob.glob("*.log"))
def test_management_qmf2(self):
self.test_management(args=["--mgmt-qmf2=yes"])