This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new a3a6de3  Fix #1508 - ITs broken by #1480 (#1509)
a3a6de3 is described below

commit a3a6de39ad8169d47fee7a5f5e2031073f067184
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Wed Feb 12 19:46:35 2020 -0500

    Fix #1508 - ITs broken by #1480 (#1509)
---
 .../main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java    | 4 ++--
 test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java 
b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
index 024c76c..08dda8a 100644
--- a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
@@ -118,12 +118,12 @@ public class VerifySerialRecoveryIT extends 
ConfigurableMacBase {
         // ignore metadata tables
         if (line.contains("!0") || line.contains("+r"))
           continue;
-        if (line.contains("Starting Write-Ahead Log")) {
+        if (line.contains("recovering data from walogs")) {
           assertFalse(started);
           started = true;
           recoveries++;
         }
-        if (line.contains("Write-Ahead Log recovery complete")) {
+        if (line.matches(".*recovered \\d+ mutations creating \\d+ entries 
from \\d+ walogs.*")) {
           assertTrue(started);
           started = false;
         }
diff --git 
a/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java 
b/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
index 2eeb20e..e2b846f 100644
--- a/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
@@ -144,7 +144,7 @@ public class MergeStateIT extends ConfigurableMacBase {
 
       // Verify the tablet state: hosted, and count
       TabletStateStore metaDataStateStore =
-          TabletStateStore.getStoreForLevel(DataLevel.USER, context);
+          TabletStateStore.getStoreForLevel(DataLevel.USER, context, state);
       int count = 0;
       for (TabletLocationState tss : metaDataStateStore) {
         if (tss != null)

Reply via email to