Narrow status check for pop

Author: DomGarguilo

core/src/main/java/org/apache/accumulo/core/fate/accumulo/AccumuloStore.java

@@ -269,9 +269,8 @@ public void pop() {
       verifyReserved(true);
 
       Optional<Integer> top = findTop();
-      top.ifPresent(t -> newMutator(fateId)
-          .requireStatus(TStatus.FAILED_IN_PROGRESS, TStatus.SUCCESSFUL, TStatus.FAILED)
-          .deleteRepo(t).mutate());
+      top.ifPresent(
+          t -> newMutator(fateId).requireStatus(TStatus.FAILED_IN_PROGRESS).deleteRepo(t).mutate());
     }
 
     @Override

test/src/main/java/org/apache/accumulo/test/fate/accumulo/FateStoreIT.java

@@ -73,6 +73,7 @@ protected void testReadWrite(FateStore<TestEnv> store, ServerContext sctx)
     assertEquals(1, store.list().count());
 
     // Push a test FATE op and verify we can read it back
+    txStore.setStatus(TStatus.IN_PROGRESS);
     txStore.push(new TestRepo("testOp"));
     TestRepo op = (TestRepo) txStore.top();
     assertNotNull(op);
@@ -101,7 +102,7 @@ protected void testReadWrite(FateStore<TestEnv> store, ServerContext sctx)
     assertEquals(TestRepo.class, ops.get(1).getClass());
 
     // test pop, TestOperation should be left
-    txStore.setStatus(TStatus.FAILED); // needed to satisfy the condition on pop
+    txStore.setStatus(TStatus.FAILED_IN_PROGRESS); // needed to satisfy the condition on pop
     txStore.pop();
     ops = txStore.getStack();
     assertEquals(1, ops.size());
@@ -112,8 +113,10 @@ protected void testReadWrite(FateStore<TestEnv> store, ServerContext sctx)
     assertEquals(2, store.list().count());
 
     // test delete
+    txStore.setStatus(TStatus.SUCCESSFUL); // needed to satisfy the condition on delete
     txStore.delete();
     assertEquals(1, store.list().count());
+    txStore2.setStatus(TStatus.SUCCESSFUL); // needed to satisfy the condition on delete
     txStore2.delete();
     assertEquals(0, store.list().count());
   }