From 5bee9733abc18405f6e4f8e059e7fd1487b5ae38 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 6 May 2010 18:53:29 +0000 Subject: Correct brokertest.retry logic. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@941852 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/cluster/Cluster.cpp | 2 +- qpid/cpp/src/tests/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/cluster/Cluster.cpp b/qpid/cpp/src/qpid/cluster/Cluster.cpp index a5581cff5e..c3d83cfcac 100644 --- a/qpid/cpp/src/qpid/cluster/Cluster.cpp +++ b/qpid/cpp/src/qpid/cluster/Cluster.cpp @@ -965,7 +965,7 @@ void Cluster::memberUpdate(Lock& l) { // Mark store clean if I am the only broker, dirty otherwise. if (size == 1 ) { if (store.getState() != STORE_STATE_CLEAN_STORE) { - QPID_LOG(notice, "Sole member of cluster, marking store clean."); + QPID_LOG(notice, *this << "Sole member of cluster, marking store clean."); store.clean(Uuid(true)); } } diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index 1faed16173..6133fc2e49 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -370,7 +370,7 @@ EXTRA_DIST+= \ check-long: $(MAKE) check TESTS="$(LONG_TESTS)" VALGRIND= -check: python_prep +check: python_prep test_env.sh PYTHON_SRC_DIR=$(abs_srcdir)/../../../python PYTHON_BLD_DIR=$(abs_builddir)/python -- cgit v1.2.1