You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2012/03/28 09:58:36 UTC
svn commit: r1306207 -
/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
Author: kwall
Date: Wed Mar 28 07:58:35 2012
New Revision: 1306207
URL: http://svn.apache.org/viewvc?rev=1306207&view=rev
Log:
QPID-3913: Fix BDBUpgradeTest for spawn test profiles
Applied patch from Oleksandr Rudyy <or...@gmail.com>
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java?rev=1306207&r1=1306206&r2=1306207&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java Wed Mar 28 07:58:35 2012
@@ -69,7 +69,7 @@ public class BDBUpgradeTest extends Qpid
public void setUp() throws Exception
{
assertNotNull("QPID_WORK must be set", QPID_WORK_ORIG);
- _storeLocation = QPID_WORK_ORIG + "/bdbstore/test-store";
+ _storeLocation = getWorkDirBaseDir() + "/bdbstore/test-store";
//Clear the two target directories if they exist.
File directory = new File(_storeLocation);
@@ -89,6 +89,11 @@ public class BDBUpgradeTest extends Qpid
super.setUp();
}
+ private String getWorkDirBaseDir()
+ {
+ return QPID_WORK_ORIG + (isInternalBroker() ? "" : "/" + getPort());
+ }
+
/**
* Test that the selector applied to the DurableSubscription was successfully
* transfered to the new store, and functions as expected with continued use
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org