[rhmessaging-commits] rhmessaging commits: r1476 - store/trunk/cpp/tests.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Thu Dec 13 08:32:57 EST 2007
Author: kpvdr
Date: 2007-12-13 08:32:57 -0500 (Thu, 13 Dec 2007)
New Revision: 1476
Modified:
store/trunk/cpp/tests/OrderingTest.cpp
store/trunk/cpp/tests/SimpleTest.cpp
store/trunk/cpp/tests/TransactionalTest.cpp
store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
store/trunk/cpp/tests/system_test.sh
Log:
Changed location for tests from /var/rhm to /tmp/rhm. This location will work out-of-the-box without root having to first create a directory.
Modified: store/trunk/cpp/tests/OrderingTest.cpp
===================================================================
--- store/trunk/cpp/tests/OrderingTest.cpp 2007-12-13 09:49:19 UTC (rev 1475)
+++ store/trunk/cpp/tests/OrderingTest.cpp 2007-12-13 13:32:57 UTC (rev 1476)
@@ -34,6 +34,8 @@
#include <queue>
#include <sstream>
+#define TESTDIR "/tmp"
+
using boost::static_pointer_cast;
using boost::dynamic_pointer_cast;
using namespace rhm::bdbstore;
@@ -104,7 +106,7 @@
void setup(bool async)
{
store = std::auto_ptr<BdbMessageStore>(new BdbMessageStore());
- store->init("/var", async, true, 4, 1);
+ store->init(TESTDIR, async, true, 4, 1);
store->truncate();
queue = Queue::shared_ptr(new Queue(name, 0, store.get(), 0));
@@ -146,7 +148,7 @@
store.reset();
store = std::auto_ptr<BdbMessageStore>(new BdbMessageStore());
- store->init("/var", async, false, 4, 1);
+ store->init(TESTDIR, async, false, 4, 1);
ExchangeRegistry exchanges;
DtxManager mgr(store.get());
RecoveryManagerImpl recoveryMgr(queues, exchanges, mgr, 0);
Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp 2007-12-13 09:49:19 UTC (rev 1475)
+++ store/trunk/cpp/tests/SimpleTest.cpp 2007-12-13 13:32:57 UTC (rev 1476)
@@ -38,6 +38,8 @@
#include <qpid/broker/QueuePolicy.h>
#include <iostream>
+#define TESTDIR "/tmp"
+
using boost::static_pointer_cast;
using boost::dynamic_pointer_cast;
using boost::intrusive_ptr;
@@ -116,7 +118,7 @@
void testEmptyRecover(bool async)
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
QueueRegistry registry(&store);
recover(store, registry);
@@ -129,7 +131,7 @@
void testCreateDelete(bool async)
{
BdbMessageStore store;
- store.init("/var", async, true, 4, 1);
+ store.init(TESTDIR, async, true, 4, 1);
store.truncate();//make sure it is empty to begin with
string name("CreateDeleteQueue");
Queue queue(name, 0, &store, 0);
@@ -150,7 +152,7 @@
string name("MyDurableQueue");
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
Queue queue(name, 0, &store, 0);
store.create(queue);
@@ -159,7 +161,7 @@
}//db will be closed
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
QueueRegistry registry(&store);
recover(store, registry);
Queue::shared_ptr queue = registry.find(name);
@@ -177,7 +179,7 @@
string name("MyDurableQueue");
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
Queue queue(name, 0, &store, 0);
FieldTable settings;
@@ -187,7 +189,7 @@
}//db will be closed
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
QueueRegistry registry(&store);
recover(store, registry);
Queue::shared_ptr queue = registry.find(name);
@@ -205,7 +207,7 @@
string name("MyDurableQueue");
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
Queue queue(name, 0, &store, 0);
store.create(queue);
@@ -213,7 +215,7 @@
}//db will be closed
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
QueueRegistry registry(&store);
recover(store, registry);
CPPUNIT_ASSERT(!registry.find(name));
@@ -236,7 +238,7 @@
string data2("hijklmn");
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
Queue queue(name, 0, &store, 0);
FieldTable settings;
@@ -255,7 +257,7 @@
}//db will be closed
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
QueueRegistry registry(&store);
recover(store, registry);
Queue::shared_ptr queue = registry.find(name);
@@ -293,7 +295,7 @@
string messageId = "MyMessage";
string data("abcdefg");
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
Queue queue(name, 0, &store, 0);
FieldTable settings;
@@ -308,7 +310,7 @@
}//db will be closed
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
QueueRegistry registry(&store);
recover(store, registry);
Queue::shared_ptr queue = registry.find(name);
@@ -329,7 +331,7 @@
const string data2("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
//create & stage a message
@@ -376,7 +378,7 @@
{
//recover
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
QueueRegistry registry(&store);
ExchangeRegistry exchanges;
DtxManager dtx(&store);
@@ -423,7 +425,7 @@
void testDestroyStagedMessage(bool async)
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
const string data("abcdefg");
@@ -449,7 +451,7 @@
void testDestroyEnqueuedMessage(bool async)
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
const string data("abcdefg");
@@ -484,7 +486,7 @@
args.setString("a", "A");
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
ExchangeRegistry registry;
Exchange::shared_ptr exchange = registry.declare(name, type, true, args).first;
@@ -494,7 +496,7 @@
}//db will be closed
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
ExchangeRegistry registry;
recover(store, registry);
@@ -508,7 +510,7 @@
}
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
ExchangeRegistry registry;
recover(store, registry);
@@ -532,7 +534,7 @@
FieldTable args;
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
Exchange::shared_ptr exchange(new DirectExchange(exchangeName, true, args));
Queue::shared_ptr queue(new Queue(queueName, 0, &store, 0));
@@ -543,7 +545,7 @@
}//db will be closed
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
ExchangeRegistry exchanges;
QueueRegistry queues;
@@ -557,7 +559,7 @@
}
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
ExchangeRegistry exchanges;
QueueRegistry queues;
@@ -581,7 +583,7 @@
FieldTable args;
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
store.truncate();//make sure it is empty to begin with
Exchange::shared_ptr exchange(new DirectExchange(exchangeName, true, args));
Queue::shared_ptr queue1(new Queue(queueName1, 0, &store, 0));
@@ -596,7 +598,7 @@
}//db will be closed
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
ExchangeRegistry exchanges;
QueueRegistry queues;
@@ -612,7 +614,7 @@
}
{
BdbMessageStore store;
- store.init("/var", async, false, 4, 1);
+ store.init(TESTDIR, async, false, 4, 1);
ExchangeRegistry exchanges;
QueueRegistry queues;
Modified: store/trunk/cpp/tests/TransactionalTest.cpp
===================================================================
--- store/trunk/cpp/tests/TransactionalTest.cpp 2007-12-13 09:49:19 UTC (rev 1475)
+++ store/trunk/cpp/tests/TransactionalTest.cpp 2007-12-13 13:32:57 UTC (rev 1476)
@@ -32,6 +32,8 @@
#include <iostream>
#include <memory>
+#define TESTDIR "/tmp"
+
using boost::static_pointer_cast;
using boost::dynamic_pointer_cast;
using namespace rhm::bdbstore;
@@ -95,7 +97,7 @@
void setup(bool async)
{
store = std::auto_ptr<BdbMessageStore>(new BdbMessageStore());
- store->init("/var", async, true, 4, 1);
+ store->init(TESTDIR, async, true, 4, 1);
store->truncate();
//create two queues:
@@ -119,7 +121,7 @@
store.reset();
store = std::auto_ptr<BdbMessageStore>(new BdbMessageStore());
- store->init("/var", async, false, 4, 1);
+ store->init(TESTDIR, async, false, 4, 1);
ExchangeRegistry exchanges;
DtxManager mgr(store.get());
RecoveryManagerImpl recovery(queues, exchanges, mgr, 0);
Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
===================================================================
--- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2007-12-13 09:49:19 UTC (rev 1475)
+++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2007-12-13 13:32:57 UTC (rev 1476)
@@ -32,6 +32,8 @@
#include <iostream>
#include <memory>
+#define TESTDIR "/tmp"
+
using boost::static_pointer_cast;
using boost::dynamic_pointer_cast;
using namespace rhm::bdbstore;
@@ -336,7 +338,7 @@
void setup()
{
store = std::auto_ptr<BdbMessageStore>(new BdbMessageStore());
- store->init("/var", async, true, 4, 1);
+ store->init(TESTDIR, async, true, 4, 1);
store->truncate();
//create two queues:
@@ -361,7 +363,7 @@
store.reset();
store = std::auto_ptr<BdbMessageStore>(new BdbMessageStore());
- store->init("/var", async, false, 4, 1);
+ store->init(TESTDIR, async, false, 4, 1);
ExchangeRegistry exchanges;
dtxmgr = std::auto_ptr<DtxManager>(new DtxManager(store.get()));
RecoveryManagerImpl recovery(queues, exchanges, *dtxmgr, 0);
Modified: store/trunk/cpp/tests/system_test.sh
===================================================================
--- store/trunk/cpp/tests/system_test.sh 2007-12-13 09:49:19 UTC (rev 1475)
+++ store/trunk/cpp/tests/system_test.sh 2007-12-13 13:32:57 UTC (rev 1476)
@@ -27,7 +27,7 @@
exit
fi
-WORKING_DIR=/var/rhm
+WORKING_DIR=/tmp
QPIDD=$QPID_DIR/cpp/src/qpidd
if test "$VERBOSE" = yes; then
@@ -44,6 +44,12 @@
export DB_HOME=dbdata
export PYTHONPATH=$QPID_DIR/python
+# Set up working dir for test
+if [ -d ${WORKING_DIR}/rhm ]; then
+ rm -rf ${WORKING_DIR}/rhm/*
+else
+ mkdir -p ${WORKING_DIR}/rhm
+fi
mkdir -p $DB_HOME || framework_failure=1
if test $framework_failure = 1; then
@@ -58,11 +64,11 @@
while ((sync <= 1)); do
echo
if ((sync == 1)); then
- JRNLFLAGS='--store-async yes --store-force yes'
+ JRNLFLAGS="--store-directory ${WORKING_DIR} --store-async yes --store-force yes"
mode='jrnl'
echo 'Journal (AIO) persistence...'
else
- JRNLFLAGS='--store-force yes'
+ JRNLFLAGS="--store-directory ${WORKING_DIR} --store-force yes"
mode='bdb'
echo 'BDB persistence...'
fi
More information about the rhmessaging-commits
mailing list