Minor fixes for tests that broke due to changes elsewhere in the code.

glinmac · Mar 20, 2013 · d486f2a · d486f2a
1 parent 96ed494
commit d486f2a
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 41 deletions.
diff --git a/test/common/voldemort/config/consistency-stores.xml b/test/common/voldemort/config/consistency-stores.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<stores>
+  <store>
+    <name>consistency-check</name>
+    <persistence>memory</persistence>
+    <routing>client</routing>
+    <replication-factor>4</replication-factor>
+    <preferred-reads>1</preferred-reads>
+    <required-reads>1</required-reads>
+    <preferred-writes>2</preferred-writes>
+    <required-writes>2</required-writes>
+    <key-serializer>
+      <type>string</type>
+      <schema-info>UTF-8</schema-info>
+    </key-serializer>
+    <value-serializer>
+      <type>string</type>
+      <schema-info>UTF-8</schema-info>
+    </value-serializer>
+    <retention-days>1</retention-days>
+  </store>
+  <store>
+    <name>consistency-fix</name>
+    <persistence>memory</persistence>
+    <routing>client</routing>
+    <replication-factor>4</replication-factor>
+    <preferred-reads>1</preferred-reads>
+    <required-reads>1</required-reads>
+    <preferred-writes>2</preferred-writes>
+    <required-writes>2</required-writes>
+    <key-serializer>
+      <type>string</type>
+      <schema-info>UTF-8</schema-info>
+    </key-serializer>
+    <value-serializer>
+      <type>string</type>
+      <schema-info>UTF-8</schema-info>
+    </value-serializer>
+    <retention-days>1</retention-days>
+  </store>
+</stores>
diff --git a/test/common/voldemort/config/stores.xml b/test/common/voldemort/config/stores.xml
@@ -232,42 +232,4 @@
       <type>java-serialization</type>
     </value-serializer>
   </store>
-  <store>
-  	<name>consistency-check</name>
-  	<persistence>memory</persistence>
-  	<routing>client</routing>
-    <replication-factor>4</replication-factor>
-    <preferred-reads>1</preferred-reads>
-    <required-reads>1</required-reads>
-    <preferred-writes>2</preferred-writes>
-    <required-writes>2</required-writes>
-    <key-serializer>
-      <type>string</type>
-      <schema-info>UTF-8</schema-info>
-    </key-serializer>
-    <value-serializer>
-      <type>string</type>
-      <schema-info>UTF-8</schema-info>
-    </value-serializer>
-    <retention-days>1</retention-days>
-  </store>
-  <store>
-	<name>consistency-fix</name>
-  	<persistence>memory</persistence>
-  	<routing>client</routing>
-    <replication-factor>4</replication-factor>
-    <preferred-reads>1</preferred-reads>
-    <required-reads>1</required-reads>
-    <preferred-writes>2</preferred-writes>
-    <required-writes>2</required-writes>
-    <key-serializer>
-      <type>string</type>
-      <schema-info>UTF-8</schema-info>
-    </key-serializer>
-    <value-serializer>
-      <type>string</type>
-      <schema-info>UTF-8</schema-info>
-    </value-serializer>
-    <retention-days>1</retention-days>
-  </store>
 </stores>
diff --git a/test/unit/voldemort/client/rebalance/AdminRebalanceTest.java b/test/unit/voldemort/client/rebalance/AdminRebalanceTest.java
@@ -410,9 +410,10 @@ public void testRebalanceNodeRW() throws IOException {
 
             // Put a plan different from the plan that we actually want to
             // execute
+            int incorrectStealerId = (plans.get(0).getStealerId() + 1) % 3;
             getServer(plans.get(0).getStealerId()).getMetadataStore()
                                                   .put(MetadataStore.REBALANCING_STEAL_INFO,
-                                                       new RebalancerState(Lists.newArrayList(new RebalancePartitionsInfo(100,
+                                                       new RebalancerState(Lists.newArrayList(new RebalancePartitionsInfo(incorrectStealerId,
                                                                                                                           plans.get(0)
                                                                                                                                .getDonorId(),
                                                                                                                           plans.get(0)

diff --git a/test/unit/voldemort/utils/ConsistencyCheckTest.java b/test/unit/voldemort/utils/ConsistencyCheckTest.java
@@ -56,7 +56,7 @@
 public class ConsistencyCheckTest {
 
     final String STORE_NAME = "consistency-check";
-    final String STORES_XML = "test/common/voldemort/config/stores.xml";
+    final String STORES_XML = "test/common/voldemort/config/consistency-stores.xml";
 
     Node n1 = new Node(1, "localhost", 10000, 10001, 10002, 0, new ArrayList<Integer>());
     Node n1_dup = new Node(1, "localhost", 10000, 10001, 10002, 0, new ArrayList<Integer>());

diff --git a/test/unit/voldemort/utils/ConsistencyFixTest.java b/test/unit/voldemort/utils/ConsistencyFixTest.java
@@ -57,7 +57,7 @@
 public class ConsistencyFixTest {
 
     final static String STORE_NAME = "consistency-fix";
-    final static String STORES_XML = "test/common/voldemort/config/stores.xml";
+    final static String STORES_XML = "test/common/voldemort/config/consistency-stores.xml";
 
     /**
      *