accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [1/4] accumulo git commit: ACCUMULO-3423 little fixes to tests now that WAL refs are always in zookeeper
Date Mon, 01 Jun 2015 17:37:44 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master fe97d5111 -> f6bd3eecd


ACCUMULO-3423 little fixes to tests now that WAL refs are always in zookeeper


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e97709a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e97709a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e97709a7

Branch: refs/heads/master
Commit: e97709a720009c4fa742083a362856b48ceb464e
Parents: 17646af
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Fri May 29 17:13:11 2015 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Fri May 29 17:13:11 2015 -0400

----------------------------------------------------------------------
 .../GarbageCollectorCommunicatesWithTServersIT.java            | 3 ++-
 .../org/apache/accumulo/test/replication/ReplicationIT.java    | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97709a7/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
b/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
index 4f9c69f..6196cca 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
@@ -219,7 +219,8 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacI
     Assert.assertEquals("Expected to only find one replication status message", 1, fileToStatus.size());
 
     String walName = fileToStatus.keySet().iterator().next();
-    Assert.assertEquals("Expected log file name from tablet to equal replication entry",
wals.iterator().next(), walName);
+    wals.retainAll(fileToStatus.keySet());
+    Assert.assertEquals(1, wals.size());
 
     Status status = fileToStatus.get(walName);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e97709a7/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 5040295..4a3015d 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@ -349,8 +349,10 @@ public class ReplicationIT extends ConfigurableMacIT {
     // We should find an entry in tablet and in the repl row
     Assert.assertEquals("Rows found: " + replRows, 1, replRows.size());
 
-    // This should be the same set of WALs that we also are using
-    Assert.assertEquals(replRows, wals);
+    // There should only be one extra WALog that replication doesn't know about
+    replRows.removeAll(wals);
+    Assert.assertEquals(2, wals.size());
+    Assert.assertEquals(0, replRows.size());
   }
 
   @Test


Mime
View raw message