You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2012/12/18 21:46:28 UTC
svn commit: r1423636 - in /accumulo/trunk:
core/src/main/java/org/apache/accumulo/core/master/thrift/
core/src/test/java/org/apache/accumulo/core/client/admin/
core/src/test/java/org/apache/accumulo/core/util/shell/command/
server/src/test/java/org/apa...
Author: vines
Date: Tue Dec 18 20:46:27 2012
New Revision: 1423636
URL: http://svn.apache.org/viewvc?rev=1423636&view=rev
Log:
ACCUMULO-912 - fixing broken tests
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java?rev=1423636&r1=1423635&r2=1423636&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java Tue Dec 18 20:46:27 2012
@@ -1111,7 +1111,7 @@ import org.slf4j.LoggerFactory;
for (int _i1 = 0; _i1 < _map0.size; ++_i1)
{
String _key2; // required
- TableInfo _val3; // required
+ TableInfo _val3; // optional
_key2 = iprot.readString();
_val3 = new TableInfo();
_val3.read(iprot);
Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java?rev=1423636&r1=1423635&r2=1423636&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java Tue Dec 18 20:46:27 2012
@@ -49,7 +49,7 @@ public class FindMaxTest extends TestCas
public void test1() throws Exception {
MockInstance mi = new MockInstance();
- Connector conn = mi.getConnector("root", "foo");
+ Connector conn = mi.getConnector("root", "");
conn.tableOperations().create("foo");
BatchWriter bw = conn.createBatchWriter("foo", new BatchWriterConfig());
Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java?rev=1423636&r1=1423635&r2=1423636&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java Tue Dec 18 20:46:27 2012
@@ -50,7 +50,7 @@ public class FormatterCommandTest {
// Keep the Shell AUDIT log off the test output
Logger.getLogger(Shell.class).setLevel(Level.WARN);
- final String[] args = new String[] {"-fake", "-u", "root", "-p", "passwd"};
+ final String[] args = new String[] {"-fake", "-u", "root", "-p", ""};
final String[] commands = createCommands();
Modified: accumulo/trunk/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java?rev=1423636&r1=1423635&r2=1423636&view=diff
==============================================================================
--- accumulo/trunk/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java (original)
+++ accumulo/trunk/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java Tue Dec 18 20:46:27 2012
@@ -46,7 +46,7 @@ import org.junit.Test;
*/
public class TestConfirmDeletes {
- AuthInfo auth = new AuthInfo("root", ByteBuffer.wrap("secret".getBytes()), "instance");
+ AuthInfo auth = new AuthInfo("root", ByteBuffer.wrap("".getBytes()), "instance");
SortedSet<String> newSet(String... s) {
SortedSet<String> result = new TreeSet<String>(Arrays.asList(s));
Modified: accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java?rev=1423636&r1=1423635&r2=1423636&view=diff
==============================================================================
--- accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java (original)
+++ accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java Tue Dec 18 20:46:27 2012
@@ -88,7 +88,7 @@ public class TestMergeState {
@Test
public void test() throws Exception {
Instance instance = new MockInstance();
- Connector connector = instance.getConnector("root", "secret");
+ Connector connector = instance.getConnector("root", "");
BatchWriter bw = connector.createBatchWriter("!METADATA", new BatchWriterConfig());
// Create a fake METADATA table with these splits
@@ -112,7 +112,7 @@ public class TestMergeState {
// Read out the TabletLocationStates
MockCurrentState state = new MockCurrentState(new MergeInfo(new KeyExtent(tableId, new Text("p"), new Text("e")), MergeInfo.Operation.MERGE));
- AuthInfo auths = new AuthInfo("root", ByteBuffer.wrap("secret".getBytes()), "instance");
+ AuthInfo auths = new AuthInfo("root", ByteBuffer.wrap("".getBytes()), "instance");
// Verify the tablet state: hosted, and count
MetaDataStateStore metaDataStateStore = new MetaDataStateStore(instance, auths, state);