summaryrefslogtreecommitdiff
path: root/cpp/src/tests/ForkedBroker.cpp
diff options
context:
space:
mode:
authorMichael Goulish <mgoulish@apache.org>2010-05-24 18:25:46 +0000
committerMichael Goulish <mgoulish@apache.org>2010-05-24 18:25:46 +0000
commit666d6136f32b8cce2af18e59d1a2cc832f98eb21 (patch)
tree5c90c470477a31d077a77da790fcfa7818be8530 /cpp/src/tests/ForkedBroker.cpp
parentac46aeaaf5a0ab1cd8b2c6c94c0b8da60fad28ed (diff)
downloadqpid-python-666d6136f32b8cce2af18e59d1a2cc832f98eb21.tar.gz
Jira QPID-2617 -- make sasl-based tests config files relocatable
Before this change, sasl-based testing cannot be fully automated because the sasl db must be located in the standard installation location of /etc/sasl2. * Created a new directory "sasl_config" under cpp/src/tests * added a new makefile fragment "sasl.mk" to cpp/src/Makefile.am conditionally included basedon HAVE_SASL, which is defined by configure. ( NOTE: should be in cpp/src/tests/Makefile.am, but getting an "saslpasswd2: generic failure" when I try that. ) * The sasl.mk fragment uses saslpasswd2 to create a sasl db in cpp/src/tests/sasl_config that defines two users with eponymous passwords. * In test cluster_authentication_soak.cpp, make the cluster name random. * make SaslAuthenticator code accept and use a config path * give cluster_authentication_soak self-test capability. the test is meant to detect two problems: - broker failure - perftest hang so give it flags that will force either of those conditions. This allows me to (anually) ensure that the test really does detect those conditions when they occur. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@947748 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/ForkedBroker.cpp')
-rw-r--r--cpp/src/tests/ForkedBroker.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/tests/ForkedBroker.cpp b/cpp/src/tests/ForkedBroker.cpp
index 529774df98..0aedb50ec1 100644
--- a/cpp/src/tests/ForkedBroker.cpp
+++ b/cpp/src/tests/ForkedBroker.cpp
@@ -40,7 +40,7 @@ return o;
namespace qpid {
namespace tests {
-ForkedBroker::ForkedBroker(const Args& constArgs) {
+ForkedBroker::ForkedBroker(const Args& constArgs) : running(false), exitStatus(0) {
Args args(constArgs);
Args::iterator i = find(args.begin(), args.end(), string("TMP_DATA_DIR"));
if (i != args.end()) {
@@ -79,6 +79,8 @@ void ForkedBroker::kill(int sig) {
throw ErrnoException("wait for forked process failed");
if (WEXITSTATUS(status) != 0 && sig != 9)
throw qpid::Exception(QPID_MSG("Forked broker exited with: " << WEXITSTATUS(status)));
+ running = false;
+ exitStatus = status;
}
bool isLogOption(const std::string& s) {
@@ -122,6 +124,7 @@ void ForkedBroker::init(const Args& userArgs) {
else throw qpid::Exception("EOF reading port number from child.");
}
::close(pipeFds[0]);
+ running = true;
}
else { // child
::close(pipeFds[0]);