This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.10 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit c025ce41ad35edbf4e49f0a29eb3a56535ba68ad Author: Xiaoyu Hou <[email protected]> AuthorDate: Wed Jul 27 09:59:35 2022 +0800 [fix][test]Fix ManagedLedgerTest#avoidUseSameOpAddEntryBetweenDifferentLedger (#16720) (cherry picked from commit 64821e1bff305203022f9cb28a233926667a54d8) --- .../org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java index 3e90ef5ec6b..af223923f22 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java @@ -2940,10 +2940,15 @@ public class ManagedLedgerTest extends MockedBookKeeperTestCase { if (i > 4) { Assert.assertEquals(oldOp.getState(), OpAddEntry.State.CLOSED); } else { - Assert.assertEquals(oldOp.getState(), OpAddEntry.State.INITIATED); + // When call `OpAddEntry#initiate`, which happens in `ledger.updateLedgersIdsComplete` above, the + // `OpAddEntry` state will be `INITIATED` if `ledger.asyncAddEntry` doesn't complete, otherwise, the + // state will be `COMPLETED` + Assert.assertTrue(oldOp.getState() == OpAddEntry.State.INITIATED + || oldOp.getState() == OpAddEntry.State.COMPLETED); } OpAddEntry newOp = ledger.pendingAddEntries.poll(); - Assert.assertEquals(newOp.getState(), OpAddEntry.State.INITIATED); + Assert.assertTrue(newOp.getState() == OpAddEntry.State.INITIATED + || newOp.getState() == OpAddEntry.State.COMPLETED); if (i > 4) { Assert.assertNotSame(oldOp, newOp); } else {
