Revision: 4070
http://bigdata.svn.sourceforge.net/bigdata/?rev=4070&view=rev
Author: thompsonbry
Date: 2011-01-09 21:21:38 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Elevated the journal.ha tests to a higher level and modified things so that the RWStore test suite was being run correctly.
Modified Paths:
--------------
branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/TestAll.java
branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/TestAll.java
branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/rwstore/TestAll.java
Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/TestAll.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/TestAll.java 2011-01-09 20:58:02 UTC (rev 4069)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/TestAll.java 2011-01-09 21:21:38 UTC (rev 4070)
@@ -101,6 +101,7 @@
// Note: this has a dependency on the quorum package.
suite.addTest(com.bigdata.io.writecache.TestAll.suite());
suite.addTest( com.bigdata.journal.TestAll.suite() );
+ suite.addTest( com.bigdata.journal.ha.TestAll.suite() );
suite.addTest( com.bigdata.resources.TestAll.suite() );
suite.addTest( com.bigdata.mdi.TestAll.suite() );
suite.addTest( com.bigdata.service.TestAll.suite() );
Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/TestAll.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/TestAll.java 2011-01-09 20:58:02 UTC (rev 4069)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/TestAll.java 2011-01-09 21:21:38 UTC (rev 4070)
@@ -140,13 +140,15 @@
suite.addTest( com.bigdata.rwstore.TestAll.suite() );
- /*
- * High Availability test suite.
- *
- * Note: There is a separate test suite for DataService high
- * availability and for the zookeeper HA integration.
- */
- suite.addTest(com.bigdata.journal.ha.TestAll.suite());
+// /* @todo This has been moved up to the top-level for how to help
+// * distinguish HA related build errors from Journal build errors.
+
+// * High Availability test suite.
+// *
+// * Note: There is a separate test suite for DataService high
+// * availability and for the zookeeper HA integration.
+// */
+// suite.addTest(com.bigdata.journal.ha.TestAll.suite());
return suite;
Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/rwstore/TestAll.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/rwstore/TestAll.java 2011-01-09 20:58:02 UTC (rev 4069)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/rwstore/TestAll.java 2011-01-09 21:21:38 UTC (rev 4070)
@@ -61,7 +61,7 @@
final TestSuite suite = new TestSuite("r/w store");
- suite.addTestSuite(com.bigdata.rwstore.TestRWJournal.class);
+ suite.addTest(com.bigdata.rwstore.TestRWJournal.suite());
return suite;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
